From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Thu, 14 Nov 2013 21:28:03 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
X-Git-Tag: grub-2.02-beta1~326
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deca601915ec51145f3ac75fe38b4e9ff14bceb1;p=thirdparty%2Fgrub.git

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

deca601915ec51145f3ac75fe38b4e9ff14bceb1
diff --cc ChangeLog
index 3788f8377,a68d3ee57..2b70f0d57
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,15 +1,19 @@@
+ 2013-11-15  Andrey Borzenkov <arvidjaar@gmail.com>
+ 
+ 	* grub-core/Makefile.core.def (signature_test): Add missing
+ 	tests/signatures.h.
+ 
+ 2013-11-14  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	* util/grub-install_header: Set localedir here, since this file is
+ 	where it's used.
+ 	* util/grub-install.in: Remove setting of localedir.
+ 	* util/grub-mkrescue.in: Likewise.
+ 
 +2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* Makefile.am (default_payload.elf): Add uhci, ohci and usb_keyboard.
 +
  2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
  
  	* configure.ac: Move nm checks to the end.