git@UCC - matches/MCTX3420.git/commit - server/bbb_pin_defines.h

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 6712989 0c55feb)

author	Sam Moore <[email protected]>
	Sat, 21 Sep 2013 17:26:51 +0000 (01:26 +0800)
committer	Sam Moore <[email protected]>
	Sat, 21 Sep 2013 17:26:51 +0000 (01:26 +0800)
commit	f5e2b07860f26bde42b9a9eb41ef68138ff2a379
tree	3a7066bd82356dc4972c0ad258a13b27c50964f8	tree \| snapshot
parent	67129899a979bf3018f73bae31d709cf3846c767	commit \| diff
parent	0c55febb46bf3bfacaeefda0a2e422b42c18710c	commit \| diff

Merge branch 'fix_hardwarecode'

Wait... it's letting me merge with no complains???

Repository for MCTX3420 2013 Project, Team 4

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