aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f4cedbb7a22..c80094ec812 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-08-16 Vinicius Jose Latorre <viniciusjl@ig.com.br>
2
3 * ps-print.el (ps-header-font-size, ps-header-title-font-size)
4 (ps-footer-font-size, ps-line-number-font-size): Docstring fix.
5
12007-08-16 Stefan Monnier <monnier@iro.umontreal.ca> 62007-08-16 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * smerge-mode.el (smerge-resolve): New arg `safe'. 8 * smerge-mode.el (smerge-resolve): New arg `safe'.