Merge branch 'master' of github:szmoore/MCTX3420 into report
authorSam Moore <[email protected]>
Mon, 28 Oct 2013 07:48:35 +0000 (15:48 +0800)
committerSam Moore <[email protected]>
Mon, 28 Oct 2013 07:48:35 +0000 (15:48 +0800)
commitf4f4c762db8c7cb2934bb03ae85063e453d68169
tree2501f30cbd8139c33ce1a40404bbafe00701a500
parent45065c1b02650ff08b7a0f4fbca7acd1ac449480
parent75b9743b95672218a61811b03433c0ab6e00ec5c
Merge branch 'master' of github:szmoore/MCTX3420 into report

Conflicts:
server/fastcgi.c
server/parameters

Also... calibrated sensors
12 files changed:
reports/final/references/refs.bib
server/actuators/pregulator.c
server/data.c
server/data.h
server/login.c
server/main.c
server/sensors/common.c
server/sensors/microphone.c
server/sensors/microphone.h
server/sensors/pressure.c
server/sensors/pressure.h
server/sensors/strain.c

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