git.ucc.asn.au / matches / MCTX3420.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
I keep forgetting; `git pull` before `git commit` avoids these crappy merge things.


Trivial merge
Repository for MCTX3420 2013 Project, Team 4

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