aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2013-08-15 19:32:02 +0200
committerJoakim Verona2013-08-15 19:32:02 +0200
commit0139d01ea2cca819089cb0264c0391a72180f556 (patch)
tree3082795783a32ef6a031c30bdbcc6571ea9da457 /src/ChangeLog
parentdd2ec20a745d3c3436b5ca842e2c0b5bf8c7e26f (diff)
parent6f94cbbcb5cefde19de8fff03834f3c8cb5f6e6d (diff)
downloademacs-0139d01ea2cca819089cb0264c0391a72180f556.tar.gz
emacs-0139d01ea2cca819089cb0264c0391a72180f556.zip
merge from trunk
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c12b32ebc71..028c33848a4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-08-15 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * image.c (imagemagick_compute_animated_image): Respect the GIF
4 disposal methods.
5
12013-08-15 Ken Brown <kbrown@cornell.edu> 62013-08-15 Ken Brown <kbrown@cornell.edu>
2 7
3 * emacs.c (main): Update comment about G_SLICE_ALWAYS_MALLOC. 8 * emacs.c (main): Update comment about G_SLICE_ALWAYS_MALLOC.