]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge with mainline
authorBVK Chaitanya <bvk.groups@gmail.com>
Sun, 11 Jul 2010 15:50:26 +0000 (21:20 +0530)
committerBVK Chaitanya <bvk.groups@gmail.com>
Sun, 11 Jul 2010 15:50:26 +0000 (21:20 +0530)
1  2 
script/parser.y
util/grub-script-check.c

diff --cc script/parser.y
Simple merge
Simple merge