git.ucc.asn.au / matches / MCTX3420.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ea228f7 386b08f)
Merge branch 'master' of github:szmoore/MCTX3420
authorSam Moore <[email protected]>
Fri, 13 Sep 2013 13:47:02 +0000 (21:47 +0800)
committerSam Moore <[email protected]>
Fri, 13 Sep 2013 13:47:02 +0000 (21:47 +0800)
commit81531e1d969957d5757887f1646d26093af96ff1
tree9e35247d609040f7ddc13e1d0dab2c03862b99datree | snapshot
parentea228f75c1f6d83f9a02a5ad5a7341caabac65c8commit | diff
parent386b08fd98454455c5b5eb5fbaeaf83126897f9fcommit | diff
Merge branch 'master' of github:szmoore/MCTX3420

Conflicts:
server/data.c
server/sensor.c

It's pretty scary how much got automatically merged.
Almost as if git is sentient.
server/data.c diff1 | diff2 | blob | history
server/data.h diff1 | diff2 | blob | history
server/fastcgi.c diff1 | diff2 | blob | history
server/sensor.c diff1 | diff2 | blob | history
Repository for MCTX3420 2013 Project, Team 4

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