git.ucc.asn.au / matches / MCTX3420.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ecce898 805b2a2)
Merge branch 'master' of github:szmoore/MCTX3420
authorSam Moore <[email protected]>
Tue, 13 Aug 2013 06:52:43 +0000 (14:52 +0800)
committerSam Moore <[email protected]>
Tue, 13 Aug 2013 06:52:43 +0000 (14:52 +0800)
commit37eab00a474b884716cf02013656589698c1db6e
tree0613838072444d78122a167cbc7465ef5d6bb5abtree | snapshot
parentecce898c5e2023522bd9b664d5f1e29347585c13commit | diff
parent805b2a2b48574031f9362c2b2e0cba051ce43a35commit | diff
Merge branch 'master' of github:szmoore/MCTX3420

I keep forgetting; `git pull` before `git commit` avoids these crappy merge things.
Repository for MCTX3420 2013 Project, Team 4

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