git.ucc.asn.au / matches / MCTX3420.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e9d726 edb6df0)
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
authorJeremy Tan <[email protected]>
Wed, 23 Oct 2013 08:13:51 +0000 (16:13 +0800)
committerJeremy Tan <[email protected]>
Wed, 23 Oct 2013 08:13:51 +0000 (16:13 +0800)
Conflicts:
server/actuators/pregulator.c
server/sensors/strain.c
testing/MCTXWeb/public_html/control.html
testing/MCTXWeb/public_html/static/mctx.control.js


Trivial merge
Repository for MCTX3420 2013 Project, Team 4

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