Merge from emacs--rel--22

[gnu-emacs] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 3998111475d39b50a0452c6c74b25a3194dafd55..7e5edd426c33c6bf6b39c45586cc03230f93bd5b 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-16  Jason Rumney  <jasonr@gnu.org>
+
+       * admin.el (set-version): Set version in nt/emacsclient.rc
+
 2008-08-06  Juanma Barranquero  <lekktu@gmail.com>
 
        * nt/dump.bat: Fix mixed EOLs.