merge mainline into sparc-mkimage

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-03 11:24:36 +01:00
commit 14532662ee
46 changed files with 670 additions and 364 deletions

View file

@ -31,7 +31,7 @@ dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
dnl type.
AC_INIT([GRUB],[1.97],[bug-grub@gnu.org])
AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
AM_INIT_AUTOMAKE()
AC_PREREQ(2.60)
AC_CONFIG_SRCDIR([include/grub/dl.h])