git@UCC - matches/MCTX3420.git/commit

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 3b075e3 a9bbebc)

author	Jeremy Tan <[email protected]>
	Sun, 22 Sep 2013 00:43:17 +0000 (08:43 +0800)
committer	Jeremy Tan <[email protected]>
	Sun, 22 Sep 2013 00:43:17 +0000 (08:43 +0800)
commit	ed189a5dd5b5ca6c052d75704dec3f58fe410387
tree	f7818fb8016879ffd316a773d936f38459228d5a	tree \| snapshot
parent	3b075e3cade9dcd625fab07a713856f657bb2230	commit \| diff
parent	a9bbebcd9a85982320208184570c0e0976fc2f43	commit \| diff

Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

server/actuator.c	diff1 \|	diff2 \|	blob \| history
server/actuator.h	diff1 \|	diff2 \|	blob \| history
server/fastcgi.c	diff1 \|	diff2 \|	blob \| history
server/sensor.c	diff1 \|	diff2 \|	blob \| history
server/sensor.h	diff1 \|	diff2 \|	blob \| history

Repository for MCTX3420 2013 Project, Team 4

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