merged mainstream into crypto

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-11-24 02:54:35 +01:00
commit 59f746dc5f
158 changed files with 45640 additions and 3018 deletions

View file

@ -2,6 +2,7 @@
10_*
30_os-prober
40_custom
aclocal.m4
autom4te.cache
build_env.mk
.bzrignore
@ -12,6 +13,7 @@ config.log
config.status
configure
conf/*.mk
conf/gcry.rmk
*.d
DISTLIST
docs/*.info
@ -44,11 +46,14 @@ grub_setup_init.h
*.img
include/grub/cpu
include/grub/machine
lib/libgcrypt-grub
*.lst
Makefile
*.mod
mod-*.c
*.pf2
po/*.mo
po/grub.pot
stamp-h
stamp-h1
stamp-h.in