merge mainline into legacy_parser

This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-09-15 11:43:59 +02:00
commit 0cb2f2813f
124 files changed
+3369 -1991

No files matched your search

+1 -1
View File
@@ -26,13 +26,13 @@
#include <grub/disk.h>
#include <grub/misc.h>
#include <grub/types.h>
#include <grub/machine/init.h>
#include <grub/partition.h>
#include <grub/machine/memory.h>
#include <grub/dl.h>
#include <grub/command.h>
#include <grub/msdos_partition.h>
#include <grub/machine/biosnum.h>
#include <grub/cpu/floppy.h>
#include <grub/i18n.h>
#include <grub/video.h>
#include <grub/mm.h>
-1
View File
@@ -25,7 +25,6 @@
#include <grub/disk.h>
#include <grub/misc.h>
#include <grub/types.h>
#include <grub/machine/init.h>
#include <grub/machine/memory.h>
#include <grub/dl.h>
#include <grub/cpu/linux.h>