git.ucc.asn.au / matches / MCTX3420.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 627505c f357778)
Merge branch 'master' of https://github.com/szmoore/MCTX3420 into users
authorJeremy Tan <[email protected]>
Sat, 26 Oct 2013 01:39:56 +0000 (09:39 +0800)
committerJeremy Tan <[email protected]>
Sat, 26 Oct 2013 01:39:56 +0000 (09:39 +0800)
Conflicts:
server/fastcgi.c
server/parameters

1  2 
.gitignore patch | diff1 | diff2 | blob | history
server/login.c patch | diff1 | diff2 | blob | history
server/main.c patch | diff1 | diff2 | blob | history

diff --cc .gitignore
Simple merge
diff --cc server/login.c
Simple merge
diff --cc server/main.c
Simple merge
Repository for MCTX3420 2013 Project, Team 4

UCC git Repository :: git.ucc.asn.au