git@UCC - matches/MCTX3420.git/commit

git.ucc.asn.au / matches / MCTX3420.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 45065c1 75b9743)

author	Sam Moore <[email protected]>
	Mon, 28 Oct 2013 07:48:35 +0000 (15:48 +0800)
committer	Sam Moore <[email protected]>
	Mon, 28 Oct 2013 07:48:35 +0000 (15:48 +0800)
commit	f4f4c762db8c7cb2934bb03ae85063e453d68169
tree	2501f30cbd8139c33ce1a40404bbafe00701a500	tree \| snapshot
parent	45065c1b02650ff08b7a0f4fbca7acd1ac449480	commit \| diff
parent	75b9743b95672218a61811b03433c0ab6e00ec5c	commit \| diff

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	diff1 \|	\|	blob \| history
server/actuators/pregulator.c	\|	diff2 \|	blob \| history
server/data.c	diff1 \|	diff2 \|	blob \| history
server/data.h	diff1 \|	diff2 \|	blob \| history
server/login.c	diff1 \|	diff2 \|	blob \| history
server/main.c	diff1 \|	diff2 \|	blob \| history
server/sensors/common.c	\|	\|	blob
server/sensors/microphone.c	\|	\|	blob
server/sensors/microphone.h	\|	\|	blob
server/sensors/pressure.c	diff1 \|	diff2 \|	blob \| history
server/sensors/pressure.h	diff1 \|	diff2 \|	blob \| history
server/sensors/strain.c	diff1 \|	diff2 \|	blob \| history

Repository for MCTX3420 2013 Project, Team 4

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