diff options
| author | Eli Zaretskii | 2010-01-02 05:57:50 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-01-02 05:57:50 -0500 |
| commit | c4810d2f26b64517c8fefe9e30b296ca41e3f8bc (patch) | |
| tree | 76bc5ababfae1476b41db09c2dbf2c8ad66f64f3 /lisp/ChangeLog | |
| parent | a179af9bd20b2e9968506003937a152c1cbb5d9e (diff) | |
| parent | 38c1ba62af2dbc5323cc8f04d297b89183d35813 (diff) | |
| download | emacs-c4810d2f26b64517c8fefe9e30b296ca41e3f8bc.tar.gz emacs-c4810d2f26b64517c8fefe9e30b296ca41e3f8bc.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4a90f2f406d..eb35ed93afc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2010-01-02 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (bzr-update): Renamed from cvs-update. | ||
| 4 | (cvs-update): New target for backward compatibility. | ||
| 5 | |||
| 6 | * makefile.w32-in (bzr-update): Renamed from cvs-update. | ||
| 7 | (cvs-update): New target for backward compatibility. | ||
| 8 | |||
| 1 | 2010-01-02 Karl Fogel <kfogel@red-bean.com> | 9 | 2010-01-02 Karl Fogel <kfogel@red-bean.com> |
| 2 | 10 | ||
| 3 | * bookmark.el: Remove gratuitous gratitude. | 11 | * bookmark.el: Remove gratuitous gratitude. |