git.ucc.asn.au / tpg / acess2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 733b37c e7a76b0)
Merge branch 'master' of git://localhost/acess2
authorJohn Hodge <[email protected]>
Tue, 6 Aug 2013 04:29:21 +0000 (12:29 +0800)
committerJohn Hodge <[email protected]>
Tue, 6 Aug 2013 04:29:21 +0000 (12:29 +0800)
commit45ff232a1db704623e0c4baed011d12cbd44b06e
tree0fd54b79b1d73647a762e00db1e36b97913bcac2tree | snapshot
parent733b37c90c20a76ec81c04431e8bc5224f053e28commit | diff
parente7a76b0d8a0cc6aa77966509780973a6f8216ef7commit | diff
Merge branch 'master' of git://localhost/acess2

Conflicts:
Usermode/Applications/irc_src/main.c
Usermode/Applications/irc_src/main.c diff1 | diff2 | blob | history
Acess2 is a semi-POSIX-compatible home-brew OS.

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