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

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

e6050a683c478a4a8537680b570ae9cdd3621db7
diff --cc ChangeLog
index 80145fa69,a111a42ff..acd4b4887
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,16 +1,20 @@@
+ 2013-11-13  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
+ 
+ 	Fix make clean.
+ 
+ 	* Makefile.am: Remove build-grub-* in make clean.
+ 
+ 2013-11-13  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
+ 
+ 	New files to gitignore.
+ 
+ 	* .gitignore: Add build-grub-gen-asciih, build-grub-gen-widthspec,
+ 	build-grub-mkfont, and grub-emu-lite. Remove .bzrignore.
+ 
 +2013-11-13  Leif Lindholm <leif.lindholm@linaro.org>
 +
 +	* grub-core/kern/arm/misc.S: Make thumb2-compatible.
 +
  2013-11-13  Leif Lindholm <leif.lindholm@linaro.org>
  
  	* .gitignore: fix rules for .dep* and add *.a post git migration