Merge from emacs--rel--22

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22db4c3fe8691b5b6d2a8d0fa80baddd42dd9a57..7b43346100c605c827a14acffa346ea326cdf6db 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-31  Jason Rumney  <jasonr@gnu.org>
+
+       * term/w32-win.el (image-library-alist): Prefer libxpm.dll.
+
+2008-01-30  Nick Roberts  <nickrob@snap.net.nz>
+
+       * progmodes/gdb-ui.el (gdb-var-set-format-regexp): New constant.
+       (gdb-var-set-format-handler): New function.
+       (gdb-var-set-format): Use it.
+
 2008-01-31  Juanma Barranquero  <lekktu@gmail.com>
 
        * linum.el (linum-unload-function): New function.