git.ucc.asn.au / tpg / acess2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 70e01c2 2c42208)
Merge branch 'master' of git://localhost/acess2
authorJohn Hodge <[email protected]>
Tue, 14 Aug 2012 08:35:14 +0000 (16:35 +0800)
committerJohn Hodge <[email protected]>
Tue, 14 Aug 2012 08:35:14 +0000 (16:35 +0800)
commitfb3abbad5dfd71ea2b190d0b33d9c57e879fb15a
tree35e11e7af79543bc16eea2ab6a9d5dafa2bc84e4tree | snapshot
parent70e01c27ee4c2f92000e0857262bec59db59efdacommit | diff
parent2c42208fbd7541023dae7ec7515b19bd4bb057c5commit | diff
Merge branch 'master' of git://localhost/acess2

Conflicts:
TODO.txt
TODO.txt diff1 | diff2 | blob | history
Acess2 is a semi-POSIX-compatible home-brew OS.

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