Merge branch 'master' of git://ted.mutabah.net/acess2
authorJohn Hodge (sonata) <[email protected]>
Tue, 11 Mar 2014 00:05:37 +0000 (08:05 +0800)
committerJohn Hodge (sonata) <[email protected]>
Tue, 11 Mar 2014 00:05:37 +0000 (08:05 +0800)
commitb7d9f86f7a1c23be18b50d5c647fd5d3c08369c3
tree402766a632fa1ee26b4d8ed36d49de5f3553e1c5
parent345637737376855a6bdea7b158b545351a3da642
parent7bf2a5d6b1b47b38fca533e2f276f0fe30af3f81
Merge branch 'master' of git://ted.mutabah.net/acess2

Conflicts:
Usermode/Libraries/libpsocket.so_src/pton.c
Usermode/Libraries/libposix.so_src/unistd.c
Usermode/Libraries/libpsocket.so_src/getaddrinfo.c
Usermode/Libraries/libpsocket.so_src/pton.c

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