Merge from trunk.

[gnu-emacs] / lib-src / ChangeLog

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 5d95ec7427701a82b88fafc02be399136b41e4b0..04d0828a8aba5954ce7e21ddad22114bda128e8e 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-06  Paul Eggert  <eggert@cs.ucla.edu>
+2011-07-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        Assume freestanding C89 headers, string.h, stdlib.h.
        * ebrowse.c: Include stdlib.h unconditionally.
@@ -11,6 +11,10 @@
        Assume support for memcmp, memcpy, memmove, memset.
        * etags.c (absolute_filename): Assume memmove exists.
 
+2011-07-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * update-game-score.c (usage): Update usage line.
+
 2011-07-02  Jason Rumney  <jasonr@gnu.org>
 
        * emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on