git.ucc.asn.au / matches / MCTX3420.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit593e1c3d650e5c31df300e75e4a908a0f5e642c1
tree5b6f6513ef7e6e41ad2402a0fc1ee9c3e46a6d3dtree | snapshot
parentbda41ea25e069e422578d2f2cfaee49f0e2cbdc9commit | diff
parent86c0f0bd42646fe12ab3a02e221b13e43544185ecommit | diff
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

Conflicts:
testing/MCTXWeb/public_html/static/style.css
Repository for MCTX3420 2013 Project, Team 4

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