git@UCC - matches/MCTX3420.git/commit - server/stream.c

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 5d9c02b 7e7ca47)

author	Jeremy Tan <[email protected]>
	Mon, 9 Sep 2013 06:32:39 +0000 (14:32 +0800)
committer	Jeremy Tan <[email protected]>
	Mon, 9 Sep 2013 06:32:39 +0000 (14:32 +0800)
commit	30279eaa8f8de4250df8cc0fa47c5febf83e56cf
tree	a03382a0aad8396459fa2edbaa284703310e4093	tree \| snapshot
parent	5d9c02bb1ca8a99e08800be88af9a9e02caf1041	commit \| diff
parent	7e7ca4729b63cdbdc037775c4e8cd2f87a668a63	commit \| diff

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

Conflicts:
server/sensor.c

server/sensor.h

Repository for MCTX3420 2013 Project, Team 4

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