aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2012-12-22 11:09:52 -0800
committerGlenn Morris2012-12-22 11:09:52 -0800
commit00afe3a454119390e78eaaa319a7d05e5e7723ae (patch)
tree26e0f292873faadeb48d6ef73710f0e5a1b308ef /doc/misc/ChangeLog
parent04d9b71ab79f7773d9dba27ae2388a9e9ca563d4 (diff)
parentddc412646dbcc51032cf438064d5eb4c8dded906 (diff)
downloademacs-00afe3a454119390e78eaaa319a7d05e5e7723ae.tar.gz
emacs-00afe3a454119390e78eaaa319a7d05e5e7723ae.zip
Merge from emacs-24; up to 2012-12-02T06:22:32Z!cyd@gnu.org
Diffstat (limited to 'doc/misc/ChangeLog')
-rw-r--r--doc/misc/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 3391a9ce9c1..f1759b5603a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12012-12-22 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (gfdl): New variable. Use throughout where
4 appropriate so that targets depend on doclicense.texi.
5
12012-12-22 Eli Zaretskii <eliz@gnu.org> 62012-12-22 Eli Zaretskii <eliz@gnu.org>
2 7
3 * makefile.w32-in ($(INFO_TARGETS), $(DVI_TARGETS)): Depend on 8 * makefile.w32-in ($(INFO_TARGETS), $(DVI_TARGETS)): Depend on