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

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

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>