aboutsummaryrefslogtreecommitdiffstats
path: root/admin/ChangeLog
diff options
context:
space:
mode:
authorKenichi Handa2012-09-30 23:39:46 +0900
committerKenichi Handa2012-09-30 23:39:46 +0900
commitc194970e15b6d6efa07697679a25dfab3aa76442 (patch)
tree49aec8be9d2dcc74ad3c81f562e48308d8e27b75 /admin/ChangeLog
parent95402d5faa114a311cabfb8c64cf22a93787a066 (diff)
parentdd946752ab8810149a66a3eff469eb128709972d (diff)
downloademacs-c194970e15b6d6efa07697679a25dfab3aa76442.tar.gz
emacs-c194970e15b6d6efa07697679a25dfab3aa76442.zip
merge trunk
Diffstat (limited to 'admin/ChangeLog')
-rw-r--r--admin/ChangeLog14
1 files changed, 14 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 7f30fe8fc0f..b5b1b75c55c 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,17 @@
12012-09-27 Glenn Morris <rgm@gnu.org>
2
3 * admin.el (set-version): Set msdos.c's Vwindow_system_version.
4
52012-09-27 Paul Eggert <eggert@cs.ucla.edu>
6
7 Check more robustly for timer_settime.
8 * merge-gnulib (GNULIB_MODULES): Add timer-time.
9
102012-09-26 Juanma Barranquero <lekktu@gmail.com>
11
12 * unidata/BidiMirroring.txt:
13 * unidata/UnicodeData.txt: Update to Unicode 6.2.
14
12012-09-17 Glenn Morris <rgm@gnu.org> 152012-09-17 Glenn Morris <rgm@gnu.org>
2 16
3 * admin.el (add-log-time-format): Declare. 17 * admin.el (add-log-time-format): Declare.