aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2012-12-05 22:17:10 -0800
committerGlenn Morris2012-12-05 22:17:10 -0800
commitd8ad4d3ff9dcea9c581d72e1e9ec292ea18673b1 (patch)
tree511f16e150fca1ed64ec71800eb0e62a9d95578a /ChangeLog
parentb7f3003fdd2e6baacddcd7657708e887a6580785 (diff)
parente1d51545ced3cf6f58c44891563dfaf62c34b411 (diff)
downloademacs-d8ad4d3ff9dcea9c581d72e1e9ec292ea18673b1.tar.gz
emacs-d8ad4d3ff9dcea9c581d72e1e9ec292ea18673b1.zip
Merge from emacs-24; up to 2012-11-24T16:58:43Z!cyd@gnu.org
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b27377baa4a..4a1e95a6ee2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12012-12-06 Glenn Morris <rgm@gnu.org>
2
3 * configure.ac: Handle info/ files with or without ".info" extension.
4
12012-11-30 Paul Eggert <eggert@cs.ucla.edu> 52012-11-30 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Merge from gnulib for 'inline' (Bug#13040), incorporating: 7 Merge from gnulib for 'inline' (Bug#13040), incorporating: