diff options
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5e51c67e8e8..62ba7017163 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2012-09-13 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * vc/vc.el: No need to require ediff. | ||
| 4 | (ediff-load-version-control): Declare. | ||
| 5 | (ediff-vc-internal): Fix declaration. | ||
| 6 | (vc-version-ediff): Require ediff. | ||
| 7 | |||
| 1 | 2012-09-13 Paul Eggert <eggert@cs.ucla.edu> | 8 | 2012-09-13 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 9 | ||
| 3 | Use a more backwards-compatible timer format (Bug#12430). | 10 | Use a more backwards-compatible timer format (Bug#12430). |