aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2011-04-19 23:27:19 -0700
committerPaul Eggert2011-04-19 23:27:19 -0700
commit997bfc65800964e26fb281c8d7490b060f4a1d87 (patch)
treee9704154fa5f96b05308fae4755aa526c2ce1327 /ChangeLog
parentb8e30af5f6f8f669a14318aa818a10e70553c821 (diff)
parentfe0e7ad71862047ff05d6822d683c3efa7f64d0e (diff)
downloademacs-997bfc65800964e26fb281c8d7490b060f4a1d87.tar.gz
emacs-997bfc65800964e26fb281c8d7490b060f4a1d87.zip
Merge from mainline.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a63fbc96bff..6a3b1701726 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12011-04-20 Ken Brown <kbrown@cornell.edu>
2
3 * configure.in (use_mmap_for_buffers): Set to yes on Cygwin.
4
12011-04-12 Glenn Morris <rgm@gnu.org> 52011-04-12 Glenn Morris <rgm@gnu.org>
2 6
3 * configure.in: Require ImageMagick >= 6.2.8. (Bug#7955) 7 * configure.in: Require ImageMagick >= 6.2.8. (Bug#7955)