Merge branch 'master' of github.com:thepowersgang/acess2
authorJohn Hodge (sonata) <[email protected]>
Fri, 3 May 2013 03:14:48 +0000 (11:14 +0800)
committerJohn Hodge (sonata) <[email protected]>
Fri, 3 May 2013 03:14:48 +0000 (11:14 +0800)
commitb806b8f55067584cb90fe20277235369a1111c66
treeb880a43844288708b6e49370ebfeae939724f5ba
parent001546477549f71fd1af08e13c60e0a39397532a
parentdd4e639d615d4a3460fe7435c7f1151a5b33c9ef
Merge branch 'master' of github.com:thepowersgang/acess2

Conflicts:
KernelLand/Kernel/arch/x86/acpica.c
RunQemu
Usermode/Applications/axwin3_src/Interface/main.c

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