Mercurial > emacs
changeset 107610:4d0362d9b52f
Merge from mainline.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 02 Jan 2010 05:57:50 -0500 |
| parents | 62ebf47086e7 (current diff) f2acba714cf4 (diff) |
| children | 118ff750e43e |
| files | |
| diffstat | 3 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jan 02 05:22:05 2010 -0500 +++ b/lisp/ChangeLog Sat Jan 02 05:57:50 2010 -0500 @@ -1,3 +1,11 @@ +2010-01-02 Eli Zaretskii <eliz@gnu.org> + + * Makefile.in (bzr-update): Renamed from cvs-update. + (cvs-update): New target for backward compatibility. + + * makefile.w32-in (bzr-update): Renamed from cvs-update. + (cvs-update): New target for backward compatibility. + 2010-01-02 Karl Fogel <kfogel@red-bean.com> * bookmark.el: Remove gratuitous gratitude.
--- a/lisp/Makefile.in Sat Jan 02 05:22:05 2010 -0500 +++ b/lisp/Makefile.in Sat Jan 02 05:57:50 2010 -0500 @@ -165,8 +165,11 @@ updates: update-subdirs autoloads finder-data custom-deps -# This is useful after "cvs up". -cvs-update: recompile autoloads finder-data custom-deps +# This is useful after "bzr up". +bzr-update: recompile autoloads finder-data custom-deps + +# For backwards compatibility: +cvs-update: bzr-update # Update the AUTHORS file.
--- a/lisp/makefile.w32-in Sat Jan 02 05:22:05 2010 -0500 +++ b/lisp/makefile.w32-in Sat Jan 02 05:57:50 2010 -0500 @@ -233,8 +233,11 @@ updates: update-subdirs autoloads mh-autoloads finder-data custom-deps -# This is useful after "cvs up". -cvs-update: recompile autoloads finder-data custom-deps +# This is useful after "bzr up". +bzr-update: recompile autoloads finder-data custom-deps + +# For backwards compatibility: +cvs-update: bzr-update # Update the AUTHORS file.