git@UCC - tpg/acess2.git/commit

git.ucc.asn.au / tpg / acess2.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3456377 7bf2a5d)

author	John Hodge (sonata) <[email protected]>
	Tue, 11 Mar 2014 00:05:37 +0000 (08:05 +0800)
committer	John Hodge (sonata) <[email protected]>
	Tue, 11 Mar 2014 00:05:37 +0000 (08:05 +0800)
commit	b7d9f86f7a1c23be18b50d5c647fd5d3c08369c3
tree	402766a632fa1ee26b4d8ed36d49de5f3553e1c5	tree \| snapshot
parent	345637737376855a6bdea7b158b545351a3da642	commit \| diff
parent	7bf2a5d6b1b47b38fca533e2f276f0fe30af3f81	commit \| diff

Merge branch 'master' of git://ted.mutabah.net/acess2

Conflicts:
Usermode/Libraries/libpsocket.so_src/pton.c

Usermode/Libraries/libposix.so_src/unistd.c	diff1 \|	diff2 \|	blob \| history
Usermode/Libraries/libpsocket.so_src/getaddrinfo.c	diff1 \|	diff2 \|	blob \| history
Usermode/Libraries/libpsocket.so_src/pton.c	diff1 \|	diff2 \|	blob \| history

Acess2 is a semi-POSIX-compatible home-brew OS.

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