aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorStefan Monnier2010-12-12 23:11:49 -0500
committerStefan Monnier2010-12-12 23:11:49 -0500
commit7a600d54c026061eee6db4e499802f524e7ebe00 (patch)
tree684aa988f06de977a52027ee5e1262c37f7678eb /ChangeLog
parentf07a954eeb0930029104402e706165bf89853576 (diff)
parentfdbb4d85ffa2ac30cb7ac0ceea6f12d0c8054d6c (diff)
downloademacs-7a600d54c026061eee6db4e499802f524e7ebe00.tar.gz
emacs-7a600d54c026061eee6db4e499802f524e7ebe00.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 aec929ce90d..0bf18e23867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12010-12-11 Glenn Morris <rgm@gnu.org>
2
3 * make-dist: Exclude etc/*.pyc.
4
12010-12-10 Andreas Schwab <schwab@linux-m68k.org> 52010-12-10 Andreas Schwab <schwab@linux-m68k.org>
2 6
3 * configure.in: Don't double machfile in final message. 7 * configure.in: Don't double machfile in final message.