merged mainstream into gfxmenu

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-11-24 01:22:41 +01:00
commit 3dcf83ba7d
69 changed files with 2657 additions and 857 deletions

View file

@ -16,7 +16,6 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <grub/machine/machine.h>
#include <grub/machine/memory.h>
#include <grub/machine/serial.h>
#include <grub/machine/console.h>

View file

@ -18,7 +18,6 @@
*/
#include <grub/term.h>
#include <grub/machine/machine.h>
#include <grub/machine/console.h>
#include <grub/time.h>
#include <grub/cpu/io.h>