diff options
| author | Glenn Morris <[email protected]> | 2012-09-13 14:23:33 -0400 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2012-09-13 14:23:33 -0400 |
| commit | b9800ec43b3e7f17cde08dc890afa690185cf9aa (patch) | |
| tree | b279358869b107ad1eef3c44e1ca8d1d0fa2b038 /lisp/ChangeLog | |
| parent | c18e885bdd2607ec1784c3e1585e581459408932 (diff) | |
* lisp/vc/vc.el: No need to require ediff.
(ediff-load-version-control): Declare.
(ediff-vc-internal): Fix declaration.
(vc-version-ediff): Require ediff.
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 5e51c67e8e..62ba701716 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2012-09-13 Glenn Morris <[email protected]> + + * vc/vc.el: No need to require ediff. + (ediff-load-version-control): Declare. + (ediff-vc-internal): Fix declaration. + (vc-version-ediff): Require ediff. + 2012-09-13 Paul Eggert <[email protected]> Use a more backwards-compatible timer format (Bug#12430). |