]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge mainline into newreloc
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Tue, 18 May 2010 12:30:07 +0000 (14:30 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Tue, 18 May 2010 12:30:07 +0000 (14:30 +0200)
1  2 
conf/common.rmk
configure.ac

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