aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2010-08-20 19:21:51 -0700
committerGlenn Morris2010-08-20 19:21:51 -0700
commit0c9b8993e006e37d5bf48dd09d96e821fcfdcd6f (patch)
tree14c5bb81d994f318b2807a3177e096258349ee4a /src
parentb5c76d0c4f52f347b1c79f94aaa8e91916814673 (diff)
downloademacs-0c9b8993e006e37d5bf48dd09d96e821fcfdcd6f.tar.gz
emacs-0c9b8993e006e37d5bf48dd09d96e821fcfdcd6f.zip
ChangeLog fixes.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 23374ba2e47..9b9e43864ab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -81,16 +81,16 @@
81 NXSecondaryPboard = SecondarySelection. 81 NXSecondaryPboard = SecondarySelection.
82 (syms_of_nsselect): Intern QCLIPBOARD (Bug#6677). 82 (syms_of_nsselect): Intern QCLIPBOARD (Bug#6677).
83 83
842010-08-18 Joakim Verona <joakim@verona.se> 842010-08-18 Joakim Verona <joakim@verona.se>
85 85
86 * image.c: Add support for ImageMagick. When HAVE_IMAGEMAGICK is 86 * image.c: Add support for ImageMagick. When HAVE_IMAGEMAGICK is
87 defined: 87 defined:
88 (imagemagick_image_p): New function to test for ImageMagic img. 88 (imagemagick_image_p): New function to test for ImageMagic image.
89 (imagemagick_load): New function to load ImageMagick img. 89 (imagemagick_load): New function to load ImageMagick image.
90 (imagemagick_load_image): New function, helper for imagemagick_load 90 (imagemagick_load_image): New function, helper for imagemagick_load.
91 (imagemagick-types): New function. 91 (imagemagick-types): New function.
92 (Qimagemagick): New Lisp_object. 92 (Qimagemagick): New Lisp_object.
93 (imagemagick-render-type): New var, decides which renderer to use 93 (imagemagick-render-type): New variable, decides which renderer to use.
94 94
952010-08-17 Stefan Monnier <monnier@iro.umontreal.ca> 952010-08-17 Stefan Monnier <monnier@iro.umontreal.ca>
96 96