git@UCC - matches/MCTX3420.git/commit

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

summary | shortlog | log | commit | commitdiff | tree
(merge: a44dc75 cf4f872)

author	Sam Moore <[email protected]>
	Sat, 19 Oct 2013 15:40:22 +0000 (23:40 +0800)
committer	Sam Moore <[email protected]>
	Sat, 19 Oct 2013 15:40:22 +0000 (23:40 +0800)
commit	544b54c409f3731b8e1581af95072a64ff393a28
tree	a314a4631251cd072ae81690ce0aba7848223fbc	tree \| snapshot
parent	a44dc75609448e871feb189bb81f84411256f52b	commit \| diff
parent	cf4f872e4a4d739408bd2f0d71887d27ebe598c9	commit \| diff

Merge branch 'master' of github:szmoore/MCTX3420

Conflicts:
server/control.c

server/actuator.c	diff1 \|	diff2 \|	blob \| history
server/common.h	diff1 \|	diff2 \|	blob \| history
server/control.c	diff1 \|	diff2 \|	blob \| history
server/control.h	diff1 \|	diff2 \|	blob \| history
server/fastcgi.c	diff1 \|	diff2 \|	blob \| history
server/main.c	diff1 \|	diff2 \|	blob \| history
server/options.h	diff1 \|	diff2 \|	blob \| history
server/sensor.c	diff1 \|	diff2 \|	blob \| history

Repository for MCTX3420 2013 Project, Team 4

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