From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Mon, 23 Dec 2013 17:17:29 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
X-Git-Tag: grub-2.02-beta2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72f099578e4da08e1a6845def03f465e65d0729e;p=thirdparty%2Fgrub.git

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

72f099578e4da08e1a6845def03f465e65d0729e
diff --cc ChangeLog
index 98d026c56,72ecf159e..8ad7bcd9f
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,23 -1,26 +1,46 @@@
+ 2013-12-23  Colin Watson  <cjwatson@debian.org>
+ 
+ 	Update some documentation to refer to Git rather than Bazaar.
+ 
+ 	* docs/grub.texi (Obtaining and Building GRUB): Refer to Git rather
+ 	than Bazaar.
+ 	* po/README: Likewise.  Fix spelling mistake.
+ 
+ 2013-12-23  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	Don't distribute config.h.
+ 
+ 	* Makefile.am (platform_HEADERS): Move to ...
+ 	(nodist_platform_HEADERS): ... here.  Fixes gettext_strings_test
+ 	failure when building from a distributed tarball.
+ 
+ 2013-12-23  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	* configure.ac: Fix spelling.
+ 	* grub-core/commands/parttool.c: Fix grammar.
+ 	* grub-core/disk/ldm.c: Use consistent capitalisation for "LDM
+ 	Embedding Partition".
+ 
 +2013-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	ARM64 support for grub-mkrescue.
 +
 +2013-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	Install modinfo.sh to keep build information around.
 +
 +2013-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* grub-core/modinfo.sh.in: Add build config information.
 +
 +2013-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	ARM64 grub-file and grub-mkconfig support.
 +
 +2013-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	Remove leftover options defines.
 +
  2013-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
  
  	* include/grub/arm64/linux.h: Remove leftovers. Add missing prefixes.