* xterm.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE:)

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 35dbeb6..5412fad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Minor merge from gnulib (mostly just for texinfo.tex).
+
 2013-08-22  Paul Eggert  <eggert@cs.ucla.edu>
 
        * configure.ac (EMACS_CONFIG_OPTIONS): Quote systematically (Bug#13274).