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

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

diff --git a/PROBLEMS b/PROBLEMS
index aa65af5..da815d4 100644 (file)
--- a/PROBLEMS
+++ b/PROBLEMS
@@ -30,6 +30,11 @@ A general advice:
 ===============================
 
 ** General
+*** egcs-1.1
+
+There have been reports of egcs-1.1 not compiling XEmacs correctly on
+Alpha Linux.  There have also been reports that egcs-1.0.3a is O.K.
+
 *** Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using
 `-fno-strength-reduce'.
 

diff --git a/dynodump/Makefile.in.in b/dynodump/Makefile.in.in
index b98e2a9..d400da1 100644 (file)
--- a/dynodump/Makefile.in.in
+++ b/dynodump/Makefile.in.in
@@ -80,7 +80,7 @@ mostlyclean:
 clean: mostlyclean
        $(RM) *.so *.so.1
 distclean: clean
-       $(RM) Makefile Makefile.in TAGS
+       $(RM) GNUmakefile Makefile Makefile.in TAGS
 realclean: distclean
 extraclean: realclean
        $(RM) *~ \#*

diff --git a/version.sh b/version.sh
index 097cc3e..814c3b1 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=5
-xemacs_codename="Aphrodite"
+emacs_beta_version=6
+xemacs_codename="Apollo"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=1