From: Jeremy Tan Date: Wed, 23 Oct 2013 08:13:51 +0000 (+0800) Subject: Merge branch 'master' of https://github.com/szmoore/MCTX3420.git X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=8b57520bc5d62881b57a4759150448338a8d957c;p=matches%2FMCTX3420.git Merge branch 'master' of https://github.com/szmoore/MCTX3420.git Conflicts: server/actuators/pregulator.c server/sensors/strain.c testing/MCTXWeb/public_html/control.html testing/MCTXWeb/public_html/static/mctx.control.js --- 8b57520bc5d62881b57a4759150448338a8d957c