git.ucc.asn.au / matches / MCTX3420.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 43c1519)
Merge branch 'master' of https://github.com/jtanx/MCTX3420 into jtanx-master
authorSam Moore <[email protected]>
Thu, 15 Aug 2013 05:27:12 +0000 (13:27 +0800)
committerSam Moore <[email protected]>
Thu, 15 Aug 2013 05:27:12 +0000 (13:27 +0800)
Conflicts:
server/log.c
server/main.c

Merged in Jeremy's changes to log functions with my changes
to the documentation.


No differences found
Repository for MCTX3420 2013 Project, Team 4

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