vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

Browse source 
Conflicts:
	ChangeLog
This commit is contained in:
Vladimir Serbinenko 2014-01-29 23:40:11 +01:00
commit 3beabdc8e4
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -58,6 +58,8 @@ grub-emu.exe
grub-emu-lite.exe
grub_emu_init.c
grub_emu_init.h
/grub-file
/grub-file.exe
grub-fstest
grub-fstest.exe
grub_fstest_init.c
@ -66,6 +68,8 @@ grub_func_test
grub-install
grub-install.exe
grub-kbdcomp
/grub-macbless
/grub-macbless.exe
grub-macho2img
/grub-menulst2cfg
/grub-menulst2cfg.exe
@ -120,6 +124,8 @@ grub-shell
grub-shell-tester
grub-sparc64-setup
grub-sparc64-setup.exe
/grub-syslinux2cfg
/grub-syslinux2cfg.exe
gzcompress_test
hddboot_test
help_test
@ -194,6 +200,7 @@ grub-core/modinfo.sh
grub-core/*.module
grub-core/*.module.exe
grub-core/*.pp
grub-core/kernel.img.bin
util/bash-completion.d/grub
grub-core/gnulib/alloca.h
grub-core/gnulib/arg-nonnull.h

8
ChangeLog
View file

@ -1,7 +1,11 @@
2014-01-26 Vladimir Serbinenko <phcoder@gmail.com>
2014-01-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/at_keyboard.c: Tolerate missing keyboard.
2014-01-29 Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
* .gitignore: add missing files and .exe variants.
2014-01-26 Mike Gilbert <floppym@gentoo.org>
grub-install: support for partitioned partx loop devices.
@ -1113,7 +1117,7 @@
2013-12-14 Vladimir Serbinenko <phcoder@gmail.com>
* .gitignore: Add .exe variants. Add missing files. Remove few outdated
* .gitignore: add .exe variants. add missing files. remove few outdated
entries.
2013-12-14 Vladimir Serbinenko <phcoder@gmail.com>