]> git.ipfire.org Git - thirdparty/grub.git/commit
merge from trunk
authorColin Watson <cjwatson@ubuntu.com>
Tue, 8 Dec 2009 00:55:17 +0000 (00:55 +0000)
committerColin Watson <cjwatson@ubuntu.com>
Tue, 8 Dec 2009 00:55:17 +0000 (00:55 +0000)
commite8b29888037096fb29d0ce643a1de6e358a38c84
treedfa41549032a3cfac4170a4d6ddf1f5106dcd7d5
parent242f0731c7805a94d79eade8cb0cf928a526839c
parente3069ec1a5ac240fed7c6b4983fbc0ab0f568ef2
merge from trunk
conf/common.rmk
normal/menu_text.c
util/grub-install.in
util/grub-mkconfig_lib.in
util/grub.d/00_header.in
util/grub.d/10_kfreebsd.in
util/grub.d/10_linux.in
util/grub.d/30_os-prober.in