merged mainline

This commit is contained in:
BVK Chaitanya 2010-03-21 11:03:41 +05:30
commit dd6fee39fa
208 changed files with 10984 additions and 2300 deletions

View file

@ -145,7 +145,7 @@ struct grub_script_cmd_menuentry
struct grub_script_arglist *arglist;
/* The sourcecode the entry will be generated from. */
char *sourcecode;
const char *sourcecode;
/* Options. XXX: Not used yet. */
int options;