git.ucc.asn.au / matches / MCTX3420.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bda41ea 86c0f0b)
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
authorJeremy Tan <[email protected]>
Sun, 29 Sep 2013 11:19:04 +0000 (19:19 +0800)
committerJeremy Tan <[email protected]>
Sun, 29 Sep 2013 11:19:04 +0000 (19:19 +0800)
Conflicts:
testing/MCTXWeb/public_html/static/style.css


Trivial merge
Repository for MCTX3420 2013 Project, Team 4

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