diff options
| author | Dan Nicolaescu | 2008-01-16 06:22:59 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-01-16 06:22:59 +0000 |
| commit | 28e4e2b434e3574f01b69c585dcccaecde6c940f (patch) | |
| tree | d53753a8d53617c9b9221d8f7bca31d78fdff120 /lisp/ChangeLog | |
| parent | 8772b5a8566ddab4aea41c6bd24d4498f56f793b (diff) | |
| download | emacs-28e4e2b434e3574f01b69c585dcccaecde6c940f.tar.gz emacs-28e4e2b434e3574f01b69c585dcccaecde6c940f.zip | |
* smerge-mode.el (smerge-start-session): Rename from smerge-auto.
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Rename callers.
* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook): Undo previous change.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2ee346b33a2..8ae0d57023d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2008-01-16 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * smerge-mode.el (smerge-start-session): Rename from smerge-auto. | ||
| 4 | * pcvs.el (cvs-revert-if-needed): | ||
| 5 | * vc.el (vc-maybe-resolve-conflicts): Rename callers. | ||
| 6 | |||
| 7 | * vc-svn.el (vc-svn-find-file-hook): | ||
| 8 | * vc-arch.el (vc-arch-find-file-hook): Undo previous change. | ||
| 9 | |||
| 1 | 2008-01-16 Ulf Jasper <ulf.jasper@web.de> | 10 | 2008-01-16 Ulf Jasper <ulf.jasper@web.de> |
| 2 | 11 | ||
| 3 | * calendar/icalendar.el (icalendar-version): Increase to 0.16. | 12 | * calendar/icalendar.el (icalendar-version): Increase to 0.16. |