git@UCC - tpg/acess2.git/commit - KernelLand/Modules/Filesystems/FAT/dir.c

git.ucc.asn.au / tpg / acess2.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 759315c 93afaf7)

author	John Hodge <[email protected]>
	Sat, 14 Jul 2012 09:23:32 +0000 (17:23 +0800)
committer	John Hodge <[email protected]>
	Sat, 14 Jul 2012 09:23:32 +0000 (17:23 +0800)
commit	11dbd684e9a3d907d43d71a3145205f1a86992fb
tree	e83df32c47afc4a791af80a9dacde59e37d30ce7	tree \| snapshot
parent	759315c5321e354458086e0fc28335c4c12ed194	commit \| diff
parent	93afaf7e85ef0eed813cd05b31f516a50f4b8f99	commit \| diff

Merge branch 'master' of ted.mutabah.net:acess2

Conflicts:
KernelLand/Kernel/Makefile

13 files changed:

BuildConf/armv7/Makefile.cfg	diff1 \|	diff2 \|	blob \| history
BuildConf/armv7/realview_pb.mk	diff1 \|	diff2 \|	blob \| history
BuildConf/armv7/tegra2.mk	diff1 \|	diff2 \|	blob \| history
KernelLand/Kernel/Makefile	diff1 \|	diff2 \|	blob \| history
KernelLand/Kernel/drvutil_video.c	\|	diff2 \|	blob \| history
KernelLand/Kernel/include/vfs.h	diff1 \|	diff2 \|	blob \| history
KernelLand/Modules/Filesystems/InitRD/files.lst	diff1 \|	diff2 \|	blob \| history
KernelLand/Modules/Input/Keyboard/main.c	diff1 \|	diff2 \|	blob \| history
KernelLand/Modules/Storage/LVM/main.c	diff1 \|	diff2 \|	blob \| history
KernelLand/Modules/Storage/LVM/volumes.c	diff1 \|	diff2 \|	blob \| history
RunQemuArm	diff1 \|	diff2 \|	blob \| history
Usermode/Applications/axwin3_src/WM/ipc.c	diff1 \|	diff2 \|	blob \| history
Usermode/Applications/axwin3_src/WM/video.c	diff1 \|	diff2 \|	blob \| history

Acess2 is a semi-POSIX-compatible home-brew OS.

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