Merge from trunk.

This commit is contained in:
Robert Millan 2009-11-27 00:03:09 +00:00
commit 3df1f5113a
25 changed files with 210 additions and 116 deletions

View file

@ -33,7 +33,7 @@ dnl type.
AC_INIT([GRUB],[1.97],[bug-grub@gnu.org])
AM_INIT_AUTOMAKE()
AC_PREREQ(2.59d)
AC_PREREQ(2.60)
AC_CONFIG_SRCDIR([include/grub/dl.h])
AC_CONFIG_HEADER([config.h])