This commit was generated by cvs2svn to compensate for changes in r39, which

included commits to RCS files with non-trunk default branches.

diff --git a/etc/NEWS b/etc/NEWS
index 30d5eb2..2e222f0 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -502,6 +502,8 @@ You will need to install a LDAP library first.  The following have
 been tested:
   - LDAP 3.3 from the University of Michigan
     (get it from <URL:http://www.umich.edu/~dirsvcs/ldap/>)
+  - OpenLDAP 1.0.3 from the OpenLDAP Foundation
+    (get it from <URL:http://www.openldap.org/>)
   - LDAP SDK 1.0 from Netscape Corp.
     (get it from <URL:http://developer.netscape.com/>)
 

diff --git a/version.sh b/version.sh
index 814c3b1..b313f11 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 emacs_major_version=21
 emacs_minor_version=2
-emacs_beta_version=6
-xemacs_codename="Apollo"
+emacs_beta_version=7
+xemacs_codename="Ares"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=1