Merge branch 'master' of git://cadel.mutabah.net/acess2
authorJohn Hodge (sonata) <[email protected]>
Thu, 1 Aug 2013 04:07:43 +0000 (12:07 +0800)
committerJohn Hodge (sonata) <[email protected]>
Thu, 1 Aug 2013 04:07:43 +0000 (12:07 +0800)
commite7a76b0d8a0cc6aa77966509780973a6f8216ef7
tree22b98be09bfb0e3c4844570e412cd2b9cc9f1965
parent7ad37b21a762c1ec19aef917b64bfb77b8318060
parent79c17683913c5ebd7195714affa5567b69a66712
Merge branch 'master' of git://cadel.mutabah.net/acess2

Conflicts:
Usermode/Applications/telnetd_src/main.c
Usermode/Libraries/libc.so_src/perror.c
Usermode/Applications/telnetd_src/main.c
Usermode/Libraries/ld-acess.so_src/include_exp/acess/devices/pty.h
Usermode/Libraries/libc.so_src/Makefile
Usermode/Libraries/libc.so_src/errno.c

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