aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorStefan Monnier2010-06-18 10:13:59 -0400
committerStefan Monnier2010-06-18 10:13:59 -0400
commit894e369ddf48e191638b8e66ce732f24ff9abe2a (patch)
tree0d14b38c2946f0067c856911bf4949b7e8091a88 /ChangeLog
parent4a330052b4815cf833071aae5cb312f6f0f63613 (diff)
parentb1a03ef6bfba4296dddc3df1e8f9d54aba3e45e3 (diff)
downloademacs-894e369ddf48e191638b8e66ce732f24ff9abe2a.tar.gz
emacs-894e369ddf48e191638b8e66ce732f24ff9abe2a.zip
Merge from trunk
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1db46b732f3..e8e509c80f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
12010-06-16 Chong Yidong <cyd@stupidchicken.com>
2
3 * INSTALL: Update font information (Bug#6389).
4
52010-06-16 Glenn Morris <rgm@gnu.org>
6
7 * INSTALL: General update.
8
12010-06-12 Glenn Morris <rgm@gnu.org> 92010-06-12 Glenn Morris <rgm@gnu.org>
2 10
3 * Makefile.in (install-arch-indep): Delete any old info .gz files first. 11 * Makefile.in (install-arch-indep): Delete any old info .gz files
12 first.
4 13
52010-06-11 Glenn Morris <rgm@gnu.org> 142010-06-11 Glenn Morris <rgm@gnu.org>
6 15