Merge branch 'mainline' into snow64

This commit is contained in:
phcoder 2009-09-04 15:18:38 +02:00
commit 30c270dbf8
15 changed files with 125 additions and 14 deletions

View file

@ -40,6 +40,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c \
commands/halt.c commands/reboot.c commands/keystatus.c \
commands/i386/cpuid.c \
commands/password.c \
lib/envblk.c commands/loadenv.c \
disk/loopback.c \
\
fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \