# HG changeset patch
# User cvs
# Date 1186995199 -7200
# Node ID b2046b8c83c913254627a5ceb133bc319f718b5f
# Parent  a6b49e840f1c2af00a86448bcac5ecf118fe788a
Import from CVS: tag r21-1-2

diff -r a6b49e840f1c -r b2046b8c83c9 CHANGES-beta
--- a/CHANGES-beta	Mon Aug 13 10:52:54 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 10:53:19 2007 +0200
@@ -1,4 +1,15 @@
 							-*- indented-text -*-
+to 21.1.2 "20 Minutes to Nikko"
+-- repackage
+
+to 21.1.1 "20 Minutes to Nikko"
+-- miscellaneous bug fixes from Gunnar Evermann
+-- font fix from Colin Rafferty
+-- miscellaneous bug fixes from Hrvoje Niksic
+-- documentation fixes from Albert Chin-A-Young, Stephen Turnbull, and
+   Gunnar Evermann
+-- miscellaneous bug fixes from Gunnar Evermann, Jan Vroonhof and Robert Pluim
+
 to 21.0.67 "20 minutes to Nikko"
 -- last minute bug & doc fixes
 
diff -r a6b49e840f1c -r b2046b8c83c9 ChangeLog
--- a/ChangeLog	Mon Aug 13 10:52:54 2007 +0200
+++ b/ChangeLog	Mon Aug 13 10:53:19 2007 +0200
@@ -1,3 +1,11 @@
+1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.2 is released
+
+1999-05-14  SL Baur  <steve@gneiss.etl.go.jp>
+
+	* CHANGES-beta: Update with changes to 21.1.1.
+
 1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.1 is released
diff -r a6b49e840f1c -r b2046b8c83c9 lib-src/ChangeLog
--- a/lib-src/ChangeLog	Mon Aug 13 10:52:54 2007 +0200
+++ b/lib-src/ChangeLog	Mon Aug 13 10:53:19 2007 +0200
@@ -1,3 +1,7 @@
+1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.2 is released
+
 1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.1 is released
diff -r a6b49e840f1c -r b2046b8c83c9 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Aug 13 10:52:54 2007 +0200
+++ b/lisp/ChangeLog	Mon Aug 13 10:53:19 2007 +0200
@@ -1,3 +1,7 @@
+1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.2 is released
+
 1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.1 is released
diff -r a6b49e840f1c -r b2046b8c83c9 lwlib/ChangeLog
--- a/lwlib/ChangeLog	Mon Aug 13 10:52:54 2007 +0200
+++ b/lwlib/ChangeLog	Mon Aug 13 10:53:19 2007 +0200
@@ -1,3 +1,7 @@
+1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.2 is released
+
 1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.1 is released
diff -r a6b49e840f1c -r b2046b8c83c9 man/ChangeLog
--- a/man/ChangeLog	Mon Aug 13 10:52:54 2007 +0200
+++ b/man/ChangeLog	Mon Aug 13 10:53:19 2007 +0200
@@ -1,3 +1,7 @@
+1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.2 is released
+
 1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.1 is released
diff -r a6b49e840f1c -r b2046b8c83c9 nt/ChangeLog
--- a/nt/ChangeLog	Mon Aug 13 10:52:54 2007 +0200
+++ b/nt/ChangeLog	Mon Aug 13 10:53:19 2007 +0200
@@ -1,3 +1,7 @@
+1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.2 is released
+
 1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.1 is released
diff -r a6b49e840f1c -r b2046b8c83c9 src/ChangeLog
--- a/src/ChangeLog	Mon Aug 13 10:52:54 2007 +0200
+++ b/src/ChangeLog	Mon Aug 13 10:53:19 2007 +0200
@@ -1,3 +1,7 @@
+1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.2 is released
+
 1999-05-14  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.1 is released
diff -r a6b49e840f1c -r b2046b8c83c9 version.sh
--- a/version.sh	Mon Aug 13 10:52:54 2007 +0200
+++ b/version.sh	Mon Aug 13 10:53:19 2007 +0200
@@ -1,8 +1,8 @@
 #!/bin/sh
 emacs_major_version=21
-emacs_minor_version=0
-emacs_beta_version=1
-xemacs_codename=""
+emacs_minor_version=1
+emacs_beta_version=2
+xemacs_codename="20 Minutes to Nikko"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=7