]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Merge branch 'phcoder/termux' of git.sv.gnu.org:/srv/git/grub into next
authorVladimir Serbinenko <phcoder@gmail.com>
Mon, 30 Jan 2017 13:42:03 +0000 (14:42 +0100)
committerVladimir Serbinenko <phcoder@gmail.com>
Mon, 30 Jan 2017 13:42:03 +0000 (14:42 +0100)
1  2 
configure.ac
grub-core/genmod.sh.in

diff --cc configure.ac
Simple merge
Simple merge