merge with mainline

This commit is contained in:
BVK Chaitanya 2010-09-04 22:34:32 +05:30
commit ee14ec9935
27 changed files with 1004 additions and 396 deletions

View file

@ -1165,6 +1165,8 @@ module = {
common = script/lexer.c;
common = script/argv.c;
common = commands/menuentry.c;
common = unidata.c;
common_nodist = grub_script.tab.c;
common_nodist = grub_script.yy.c;
@ -1385,4 +1387,4 @@ module = {
module = {
name = test_blockarg;
common = tests/test_blockarg.c;
};
};