merge trunk

This commit is contained in:
Szymon Janc 2011-08-13 15:00:48 +02:00
commit 99cecb4fc7
548 changed files with 39743 additions and 8076 deletions

View file

@ -29,6 +29,8 @@
#include <grub/command.h>
#include <grub/i18n.h>
GRUB_MOD_LICENSE ("GPLv3+");
/* cat FILE */
static grub_err_t
grub_mini_cmd_cat (struct grub_command *cmd __attribute__ ((unused)),