git.ucc.asn.au / matches / MCTX3420.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1321a7 b101617)
Merge branch 'master' of github:szmoore/MCTX3420
authorSam Moore <[email protected]>
Wed, 7 Aug 2013 13:02:19 +0000 (21:02 +0800)
committerSam Moore <[email protected]>
Wed, 7 Aug 2013 13:02:19 +0000 (21:02 +0800)
This merge is necessary because I forgot to `git pull` before I did `git commit`
and I didn't have the latest IRC logs. I should stop doing that.


Trivial merge
Repository for MCTX3420 2013 Project, Team 4

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