aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorKenichi Handa2012-10-24 00:47:51 +0900
committerKenichi Handa2012-10-24 00:47:51 +0900
commit6a8f8193298e05931baeebb1bd3aba6f8f5a7b5e (patch)
treefcee273be31e69f367b6f820aa32de660e541b2f /ChangeLog
parent7e70a15287ee1ae5461d47e5a96d6c455aefaf57 (diff)
parentd106953274d29b6be4ef7e2c442078c81a52ff2f (diff)
downloademacs-6a8f8193298e05931baeebb1bd3aba6f8f5a7b5e.tar.gz
emacs-6a8f8193298e05931baeebb1bd3aba6f8f5a7b5e.zip
merge trunk
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 81eddade0a0..362c2adc2d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
12012-10-21 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (install-etc): Don't install emacs22 icons.
4
5 * Makefile.in (emacs_transform): New variable.
6 (install-etc): Prefer a make variable to a shell variable.
7
12012-10-18 Stefan Monnier <monnier@iro.umontreal.ca> 82012-10-18 Stefan Monnier <monnier@iro.umontreal.ca>
2 9
3 * Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well. 10 * Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well.