]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge in mainline
authorBVK Chaitanya <bvk.groups@gmail.com>
Tue, 16 Mar 2010 12:12:27 +0000 (17:42 +0530)
committerBVK Chaitanya <bvk.groups@gmail.com>
Tue, 16 Mar 2010 12:12:27 +0000 (17:42 +0530)
1  2 
include/grub/script_sh.h
script/execute.c
script/parser.y
util/grub-script-check.c

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