aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2011-11-13 20:35:22 -0800
committerPaul Eggert2011-11-13 20:35:22 -0800
commitc3ca24d48c10fb771ee02eb58f7d49bd82d6306e (patch)
treee707b79a846623490feea39a4dceb86dd218eb4d /ChangeLog
parent6a0bf43d7c5961297aa5024aec534e5bab73c8af (diff)
parent56632ce4cd8616f0613e8734d62ec5e2f833c7dc (diff)
downloademacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.tar.gz
emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.zip
Merge from trunk.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 68f5042d7cf..bce682d5d88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12011-11-13 Glenn Morris <rgm@gnu.org>
2
3 * INSTALL: Tiny updates for disk space used during installation.
4
12011-11-05 Eli Zaretskii <eliz@gnu.org> 52011-11-05 Eli Zaretskii <eliz@gnu.org>
2 6
3 * lib/makefile.w32-in (FRC): New dummy target. 7 * lib/makefile.w32-in (FRC): New dummy target.