# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1262429870 18000
# Node ID 4d0362d9b52f92e161d9881c98e884011eeeb99a
# Parent  62ebf47086e7101a64df0573560832a90eb6dcf2# Parent  f2acba714cf443a54fa1af2a8ce3592c1ad54dae
Merge from mainline.

diff -r 62ebf47086e7 -r 4d0362d9b52f lisp/ChangeLog
--- 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.
diff -r 62ebf47086e7 -r 4d0362d9b52f lisp/Makefile.in
--- 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.
 
diff -r 62ebf47086e7 -r 4d0362d9b52f lisp/makefile.w32-in
--- 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.