From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sun, 27 Oct 2013 19:45:43 +0000 (+0400)
Subject: Merge branch 'fu/disk_common'
X-Git-Tag: grub-2.02-beta1~547
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11d81fc6d178c1d17044b225fecda7d3a40abce5;p=thirdparty%2Fgrub.git

Merge branch 'fu/disk_common'
---

11d81fc6d178c1d17044b225fecda7d3a40abce5
diff --cc ChangeLog
index 302d3d8eb,bfa503adf..d697f20af
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,10 +1,24 @@@
+ 2013-10-14  Andrey Borzenkov <arvidjaar@gmail.com>
+ 
+ 	*  Makefile.util.def: Add grub-core/kern/disk_common.c to library
+ 	extra_dist.
+ 	* grub-core/Makefile.core.def: Add kern/disk_common.c to disk module
+ 	extra_dist.
+ 
 +2013-10-27  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* util/grub-mkfont.c (main): Show error message when FT_Set_Pixel_Sizes
 +	fails.
 +
 +2013-10-27  BVK Chaitanya  <bvk.groups@gmail.com>
 +
 +	* docs/autoiso.cfg: New file.
 +
 +2013-10-27  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* configure.ac: Remove leftover COND_BUILD_GRUB_MKFONT and
 +	COND_GRUB_PE2ELF conditions.
 +
  2013-10-27  Vladimir Serbinenko  <phcoder@gmail.com>
  
  	* grub-core/loader/i386/bsd.c (grub_cmd_openbsd): Accept "sd", "cd",