git.ucc.asn.au / tpg / acess2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 66250a1 0f8f851)
Merge branch 'master' of git://cadel.mutabah.net/acess2
authorJohn Hodge (sonata) <[email protected]>
Sun, 15 Feb 2015 07:57:04 +0000 (15:57 +0800)
committerJohn Hodge (sonata) <[email protected]>
Sun, 15 Feb 2015 07:57:04 +0000 (15:57 +0800)
commit6274aaa8894e14462a36c69090e2f9235f130e31
tree7b1254e51f03a75f05e359de3c1b0fcc5abad6detree | snapshot
parent66250a13b0607f3599999a0ab70453ef1658c20fcommit | diff
parent0f8f8512428951efbd3529079857158b04e18d80commit | diff
Merge branch 'master' of git://cadel.mutabah.net/acess2

Conflicts:
Externals/cross-compiler/Makefile
Externals/cross-compiler/Makefile diff1 | diff2 | blob | history
Externals/cross-compiler/Makefile.common.mk diff1 | | blob | history
Tools/NetTest_Runner/test_tcp.c diff1 | diff2 | blob | history
Acess2 is a semi-POSIX-compatible home-brew OS.

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