merge trunk

This commit is contained in:
Colin Watson 2011-05-18 16:53:36 +01:00
commit e806ce60ee
431 changed files with 17605 additions and 2568 deletions

View file

@ -22,6 +22,8 @@
#include <grub/misc.h>
#include <grub/mm.h>
GRUB_MOD_LICENSE ("GPLv3+");
/* The list of video adapters registered to system. */
grub_video_adapter_t grub_video_adapter_list = NULL;