aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2012-04-20 16:48:50 +0800
committerChong Yidong2012-04-20 16:48:50 +0800
commitc07a4c0b599e0debfb10acdf02ac6559b998a88a (patch)
treef87bca47c21f04b43cca2347a21ed89c57b67958 /ChangeLog
parent6cf2a23e297b8a57a70c2a1dab5aa28b73461b0b (diff)
parent50e5ebca7edcf5299b89ff74499991de01e22046 (diff)
downloademacs-c07a4c0b599e0debfb10acdf02ac6559b998a88a.tar.gz
emacs-c07a4c0b599e0debfb10acdf02ac6559b998a88a.zip
Merge from emacs-24 branch
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 95baf9c5294..d2da3d8527b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
12012-04-20 Ludovic Courtès <ludo@gnu.org>
2
3 * configure.in: Don't use the -R option (Bug#11251).
4
52012-04-20 Teodor Zlatanov <tzz@lifelogs.com>
6
7 * info/dir, Makefile.in (INFO_FILES): Add emacs-gnutls.
8
12012-04-18 Paul Eggert <eggert@cs.ucla.edu> 92012-04-18 Paul Eggert <eggert@cs.ucla.edu>
2 10
3 configure: new option --enable-gcc-warnings (Bug#11207) 11 configure: new option --enable-gcc-warnings (Bug#11207)