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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 627505c f357778)

author	Jeremy Tan <[email protected]>
	Sat, 26 Oct 2013 01:39:56 +0000 (09:39 +0800)
committer	Jeremy Tan <[email protected]>
	Sat, 26 Oct 2013 01:39:56 +0000 (09:39 +0800)
commit	3dfde391486e81a357e08a24ccb7903c8adfa5aa
tree	454ec14567bf4a9295626b0401a797b208fcb3e5	tree \| snapshot
parent	627505c91d4bb7be16dc0925ee9de54e007621a2	commit \| diff
parent	f357778daedbdef147607bcc4f56ee2bd44a489c	commit \| diff

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

Conflicts:
server/fastcgi.c
server/parameters

.gitignore	diff1 \|	diff2 \|	blob \| history
server/login.c	diff1 \|	diff2 \|	blob \| history
server/main.c	diff1 \|	diff2 \|	blob \| history

Repository for MCTX3420 2013 Project, Team 4

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