From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 28 Jan 2010 16:18:15 +0000 (+0530)
Subject: sync with trunk
X-Git-Tag: 1.98~102^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=366e15ba86a91bf06bfd948830c58b4581323b1c;p=thirdparty%2Fgrub.git

sync with trunk
---

366e15ba86a91bf06bfd948830c58b4581323b1c
diff --cc ChangeLog
index c000b38d6,d40f765a7..4e30a39a8
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,18 +1,23 @@@
 +2010-01-28  BVK Chaitanya  <bvk.groups@gmail.com>
 +
 +	* include/grub/script_sh.h (sourcecode): Add const qualifier.
 +	* util/grub-script-check.c (getline): Fix empty lines case.
 +
+ 2010-01-28  Robert Millan  <rmh.grub@aybabtu.com>
+ 
+ 	* Makefile.in (check): Exit with fail status when one of the tests
+ 	fails.
+ 	* tests/example_functional_test.c (example_test): Fix reversed assert.
+ 	* tests/example_unit_test.c (example_test): Likewise.
+ 
+ 2010-01-28  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	* util/grub.d/10_linux.in: This script does not use any of the
+ 	contents of gettext.sh, only the external command `gettext', so stop
+ 	sourcing it.  (Moreover, gettext.sh isn't necessarily installed in
+ 	the same prefix as GRUB.)
+ 	* util/grub.d/10_kfreebsd.in: Likewise.
+ 
  2010-01-27  Vladimir Serbinenko  <phcoder@gmail.com>
  
  	* normal/cmdline.c (grub_cmdline_get): Fix completion in the middle