merged with mainline

2010-04-09 21:44:59 +05:30 · 2010-04-09 21:44:59 +05:30 · c41c00eab6
commit c41c00eab6
parent baae00df35 14e18ae351
99 changed files with 20896 additions and 2748 deletions
--- a/script/parser.y
+++ b/script/parser.y
@ -93,7 +93,7 @@ script: newlines0
        {
          $$ = 0;
        }
-      | script statement delimiter
+      | script statement delimiter newlines0
        {
          struct grub_script_cmdblock *cmdblock;
          cmdblock = (struct grub_script_cmdblock *) $1;