aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2013-08-14 04:28:55 +0200
committerJoakim Verona2013-08-14 04:28:55 +0200
commit0d91bd8ed5d34f17cfa64d50ef02d414b962150a (patch)
treeccdcc17d673d265892d12b9a9fe9f2807d6384b8 /ChangeLog
parentcdbfa34f19db4742f6f2c253b6f009710c598443 (diff)
parentaf79c3cb0b5ac53484ffc8a39894d475527a2e8a (diff)
downloademacs-0d91bd8ed5d34f17cfa64d50ef02d414b962150a.tar.gz
emacs-0d91bd8ed5d34f17cfa64d50ef02d414b962150a.zip
merge from trunk
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c0b7d967113..23e4b038663 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-08-14 Ulrich Müller <ulm@gentoo.org>
2
3 * configure.ac (EMACS_CONFIGURATION): Escape backslashes. (Bug#15091)
4
12013-08-12 Eli Zaretskii <eliz@gnu.org> 52013-08-12 Eli Zaretskii <eliz@gnu.org>
2 6
3 * configure.ac (HAVE_ZLIB): Don't use -lz on MinGW. 7 * configure.ac (HAVE_ZLIB): Don't use -lz on MinGW.