# HG changeset patch
# User stephent
# Date 1143832857 0
# Node ID 14995b91af1050a8cd32c22063b9a09d268844ed
# Parent  cf02a1da936aff416893797af4723a007a2b53bf
[xemacs-hg @ 2006-03-31 19:18:19 by stephent]
XEmacs 21.5.26 "endive" is released.

diff -r cf02a1da936a -r 14995b91af10 ChangeLog
--- a/ChangeLog	Fri Mar 31 17:51:39 2006 +0000
+++ b/ChangeLog	Fri Mar 31 19:20:57 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.26 "endive" is released.
+
 2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	Miscellaneous doc cleanup, parts 2-4: move CHANGES-msw,
diff -r cf02a1da936a -r 14995b91af10 configure
--- a/configure	Fri Mar 31 17:51:39 2006 +0000
+++ b/configure	Fri Mar 31 19:20:57 2006 +0000
@@ -16444,7 +16444,7 @@
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Xlib.h.
+  # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16452,7 +16452,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -16479,7 +16479,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Xlib.h"; then
+  if test -r "$ac_dir/X11/Intrinsic.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -16500,11 +16500,11 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
-int
-main ()
-{
-XrmInitialize ()
+#include <X11/Intrinsic.h>
+int
+main ()
+{
+XtMalloc (0)
   ;
   return 0;
 }
diff -r cf02a1da936a -r 14995b91af10 etc/ChangeLog
--- a/etc/ChangeLog	Fri Mar 31 17:51:39 2006 +0000
+++ b/etc/ChangeLog	Fri Mar 31 19:20:57 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.26 "endive" is released.
+
 2006-02-26  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.25 "eggplant" is released.
diff -r cf02a1da936a -r 14995b91af10 lib-src/ChangeLog
--- a/lib-src/ChangeLog	Fri Mar 31 17:51:39 2006 +0000
+++ b/lib-src/ChangeLog	Fri Mar 31 19:20:57 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.26 "endive" is released.
+
 2006-02-26  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.25 "eggplant" is released.
diff -r cf02a1da936a -r 14995b91af10 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Mar 31 17:51:39 2006 +0000
+++ b/lisp/ChangeLog	Fri Mar 31 19:20:57 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.26 "endive" is released.
+
 2006-03-31  Marcus Crestani  <marcus.crestani@ub.uni-tuebingen.de>
 
 	* diagnose.el (show-mc-alloc-memory-usage): Rename buffer to
diff -r cf02a1da936a -r 14995b91af10 lwlib/ChangeLog
--- a/lwlib/ChangeLog	Fri Mar 31 17:51:39 2006 +0000
+++ b/lwlib/ChangeLog	Fri Mar 31 19:20:57 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.26 "endive" is released.
+
 2006-02-26  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.25 "eggplant" is released.
diff -r cf02a1da936a -r 14995b91af10 man/ChangeLog
--- a/man/ChangeLog	Fri Mar 31 17:51:39 2006 +0000
+++ b/man/ChangeLog	Fri Mar 31 19:20:57 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.26 "endive" is released.
+
 2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	Miscellaneous doc cleanup, parts 2-4: move CHANGES-msw,
diff -r cf02a1da936a -r 14995b91af10 modules/ChangeLog
--- a/modules/ChangeLog	Fri Mar 31 17:51:39 2006 +0000
+++ b/modules/ChangeLog	Fri Mar 31 19:20:57 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.26 "endive" is released.
+
 2006-02-26  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.25 "eggplant" is released.
diff -r cf02a1da936a -r 14995b91af10 netinstall/ChangeLog
--- a/netinstall/ChangeLog	Fri Mar 31 17:51:39 2006 +0000
+++ b/netinstall/ChangeLog	Fri Mar 31 19:20:57 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.26 "endive" is released.
+
 2006-02-26  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.25 "eggplant" is released.
diff -r cf02a1da936a -r 14995b91af10 nt/ChangeLog
--- a/nt/ChangeLog	Fri Mar 31 17:51:39 2006 +0000
+++ b/nt/ChangeLog	Fri Mar 31 19:20:57 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.26 "endive" is released.
+
 2006-02-27  Vin Shelton  <acs@xemacs.org>
 
 	* config.inc.samp: Comment out PACKAGE_PREFIX.
diff -r cf02a1da936a -r 14995b91af10 nt/installer/Wise/ChangeLog
--- a/nt/installer/Wise/ChangeLog	Fri Mar 31 17:51:39 2006 +0000
+++ b/nt/installer/Wise/ChangeLog	Fri Mar 31 19:20:57 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.26 "endive" is released.
+
 2006-02-26  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.25 "eggplant" is released.
diff -r cf02a1da936a -r 14995b91af10 src/ChangeLog
--- a/src/ChangeLog	Fri Mar 31 17:51:39 2006 +0000
+++ b/src/ChangeLog	Fri Mar 31 19:20:57 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.26 "endive" is released.
+
 2006-03-30  Adrian Aichner  <adrian@xemacs.org>
 
 	* lisp.h (Dynarr_add): Add local variable imp to avoid VC6
diff -r cf02a1da936a -r 14995b91af10 tests/ChangeLog
--- a/tests/ChangeLog	Fri Mar 31 17:51:39 2006 +0000
+++ b/tests/ChangeLog	Fri Mar 31 19:20:57 2006 +0000
@@ -1,3 +1,7 @@
+2006-03-31  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.26 "endive" is released.
+
 2006-02-26  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.25 "eggplant" is released.
diff -r cf02a1da936a -r 14995b91af10 version.sh
--- a/version.sh	Fri Mar 31 17:51:39 2006 +0000
+++ b/version.sh	Fri Mar 31 19:20:57 2006 +0000
@@ -2,11 +2,11 @@
 emacs_is_beta=t
 emacs_major_version=21
 emacs_minor_version=5
-emacs_beta_version=25
-xemacs_codename="eggplant"
+emacs_beta_version=26
+xemacs_codename="endive"
 emacs_kit_version=
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=8
-xemacs_extra_name="(+CVS-20060330)"
-xemacs_release_date="2006-02-26"
+xemacs_extra_name=""
+xemacs_release_date="2006-04-01"