]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Merge from trunk
authorRobert Millan <rmh@aybabtu.com>
Sat, 12 Dec 2009 00:07:45 +0000 (00:07 +0000)
committerRobert Millan <rmh@aybabtu.com>
Sat, 12 Dec 2009 00:07:45 +0000 (00:07 +0000)
1  2 
conf/any-emu.rmk
conf/common.rmk
util/grub-install.in

Simple merge
diff --cc conf/common.rmk
Simple merge
Simple merge