git.ucc.asn.au / matches / MCTX3420.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed9f406 e45973c)
Merge branch 'master' into users
authorJeremy Tan <[email protected]>
Mon, 21 Oct 2013 03:18:53 +0000 (11:18 +0800)
committerJeremy Tan <[email protected]>
Mon, 21 Oct 2013 03:18:53 +0000 (11:18 +0800)
Conflicts:
server/fastcgi.c

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

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

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