# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1328804828 18000
# Node ID 1238163688a0ef03134e5b2b8a5412ea63a39eac
# Parent  06f706e92771f1491c1a3045bc670a57a6480a9d# Parent  e9081ee7e714ea87745dd95747afdb701d2e8650
maint: merge release candidate changesets

diff -r 06f706e92771 -r 1238163688a0 .hgtags
--- a/.hgtags	Wed Feb 08 16:44:13 2012 -0500
+++ b/.hgtags	Thu Feb 09 11:27:08 2012 -0500
@@ -59,3 +59,4 @@
 72aebe6196414e38ef802469ff6e238f914f04c9 rc-3-6-0-0
 64d9f33313cc8c691974bcd123357e24bccbabdc rc-3-6-0-1
 704f7895eef03008dd79848eb9da4bfb40787d73 release-3.6.0
+95c43fc8dbe1a07a46fefb3372df5b2309d874fd rc-3-6-1-0
diff -r 06f706e92771 -r 1238163688a0 configure.ac
--- a/configure.ac	Wed Feb 08 16:44:13 2012 -0500
+++ b/configure.ac	Thu Feb 09 11:27:08 2012 -0500
@@ -27,13 +27,13 @@
 EXTERN_CFLAGS="$CFLAGS"
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
-AC_INIT([GNU Octave], [3.6.0], [http://octave.org/bugs.html], [octave])
+AC_INIT([GNU Octave], [3.6.1-rc0], [http://octave.org/bugs.html], [octave])
 
 dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg
 OCTAVE_VERSION="$PACKAGE_VERSION"
 OCTAVE_API_VERSION_NUMBER="48"
 OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+"
-OCTAVE_RELEASE_DATE="2012-01-15"
+OCTAVE_RELEASE_DATE="2012-02-07"
 OCTAVE_COPYRIGHT="Copyright (C) 2012 John W. Eaton and others."
 AC_SUBST(OCTAVE_VERSION)
 AC_SUBST(OCTAVE_API_VERSION_NUMBER)
diff -r 06f706e92771 -r 1238163688a0 liboctave/Makefile.am
--- a/liboctave/Makefile.am	Wed Feb 08 16:44:13 2012 -0500
+++ b/liboctave/Makefile.am	Thu Feb 09 11:27:08 2012 -0500
@@ -521,7 +521,7 @@
 # Increment these as needed and according to the rules in the libtool
 # manual:
 liboctave_current = 1
-liboctave_revision = 0
+liboctave_revision = 1
 liboctave_age = 0
 
 liboctave_version_info = $(liboctave_current):$(liboctave_revision):$(liboctave_age)
diff -r 06f706e92771 -r 1238163688a0 src/Makefile.am
--- a/src/Makefile.am	Wed Feb 08 16:44:13 2012 -0500
+++ b/src/Makefile.am	Thu Feb 09 11:27:08 2012 -0500
@@ -516,7 +516,7 @@
 
 # Increment these as needed and according to the rules in the libtool manual:
 liboctinterp_current = 1
-liboctinterp_revision = 0
+liboctinterp_revision = 1
 liboctinterp_age = 0
 
 liboctinterp_version_info = $(liboctinterp_current):$(liboctinterp_revision):$(liboctinterp_age)