aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2012-06-10 21:20:58 +0800
committerChong Yidong2012-06-10 21:20:58 +0800
commit31ca4639ad1bfaa355a3f30ef92eb977bd2c6b78 (patch)
tree77814646f8df2d6c463fe0052ff25f8635d410b5 /doc/misc/ChangeLog
parentc758c4fd178a3778b7e6f235af41a898a8e7b972 (diff)
parentedcdbe4d3121ac663c2c72fce5b69a59c86ecaa1 (diff)
downloademacs-31ca4639ad1bfaa355a3f30ef92eb977bd2c6b78.tar.gz
emacs-31ca4639ad1bfaa355a3f30ef92eb977bd2c6b78.zip
Merge from emacs-24; up to 2012-04-25T15:23:19Z!sdl.web@gmail.com
Diffstat (limited to 'doc/misc/ChangeLog')
-rw-r--r--doc/misc/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ccf8c4df40e..9f9717aab29 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12012-06-10 Chong Yidong <cyd@gnu.org>
2
3 * sc.texi: Remove bogus @ifinfo commands which prevent makeinfo
4 compilation for html-mono.
5
12012-06-08 Paul Eggert <eggert@cs.ucla.edu> 62012-06-08 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * texinfo.tex: Merge from gnulib. 8 * texinfo.tex: Merge from gnulib.