projects
/
grub.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7f64fb5
ba584da
)
Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
author
Vladimir Serbinenko
<phcoder@gmail.com>
Wed, 29 Jan 2014 22:40:11 +0000
(23:40 +0100)
committer
Vladimir Serbinenko
<phcoder@gmail.com>
Wed, 29 Jan 2014 22:40:11 +0000
(23:40 +0100)
Conflicts:
ChangeLog
1
2
ChangeLog
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
ChangeLog
index
d37d4a6
,
b996df8
..
5692a5b
---
1
/
ChangeLog
---
2
/
ChangeLog
+++ b/
ChangeLog
@@@
-1,7
-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.