git@UCC - matches/MCTX3420.git/commit

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 685168f 8f94dbb)

author	Sam Moore <[email protected]>
	Thu, 12 Sep 2013 15:50:44 +0000 (23:50 +0800)
committer	Sam Moore <[email protected]>
	Thu, 12 Sep 2013 15:50:44 +0000 (23:50 +0800)
commit	bbd64b3c32d79d247c7535693aafa20a3baba6b8
tree	00831cee85c0b37d8aea4e8d34f2c0a3ee4672f7	tree \| snapshot
parent	685168f14cc0129bc5f49e476602d223563e6660	commit \| diff
parent	8f94dbb551783aad414b57ba6da4596f19dc80a6	commit \| diff

Merge branch 'refactor'

Conflicts:
server/sensor.c
server/sensor.h

Also made the resulting code compile.

BUT...
There are memory errors in the FCGI code :S

server/common.h	diff1 \|	diff2 \|	blob \| history
server/data.c	\|	diff2 \|	blob \| history
server/fastcgi.c	diff1 \|	diff2 \|	blob \| history
server/run.sh	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