git.ucc.asn.au / matches / MCTX3420.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 733a9b9 5bd6ace)
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)
commit43c1519cb60f8fef09043b9af6f43d319db12e3d
treeb886005920e51ab39a07a61321701b302c55950ctree | snapshot
parent733a9b968264c48b5340693ce17e1874c1aeff77commit | diff
parent5bd6aced71333d0dc8d142f593073c68811e5435commit | diff
Merge branch 'master' of https://github.com/jtanx/MCTX3420 into jtanx-master

Conflicts:
server/log.c
server/main.c

Merged in Jeremy's changes to log functions with my changes
to the documentation.
server/log.c diff1 | | blob | history
server/log.h diff1 | | blob | history
server/main.c diff1 | | blob | history
Repository for MCTX3420 2013 Project, Team 4

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