aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11703054d4f..31e50780b0d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,9 @@
6 (vc-menu-map): Declare and initialize in one step. 6 (vc-menu-map): Declare and initialize in one step.
7 (vc-menu-map-filter): Move&rename from menu-bar.el:menu-bar-vc-filter 7 (vc-menu-map-filter): Move&rename from menu-bar.el:menu-bar-vc-filter
8 8
9 * menu-bar.el (vc-menu-map): Don't setup any more.
10 Instead, just create the proper spot in the menu.
11
92007-08-20 Stefan Monnier <monnier@iro.umontreal.ca> 122007-08-20 Stefan Monnier <monnier@iro.umontreal.ca>
10 13
11 * smerge-mode.el (smerge-resolve): New arg `safe'. 14 * smerge-mode.el (smerge-resolve): New arg `safe'.