]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Merge mainline into boottest
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 20 Jan 2010 21:23:00 +0000 (22:23 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 20 Jan 2010 21:23:00 +0000 (22:23 +0100)
1  2 
conf/common.rmk
conf/i386-pc.rmk
conf/i386.rmk

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