# HG changeset patch
# User jwe
# Date 1175027891 0
# Node ID 23e8f1cf79ab252a7b824e7bcf775d97f10386b7
# Parent  cfa1dc1f584d5a63296084b96fc9be0061c1ae30
[project @ 2007-03-27 20:38:11 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,7 @@
-<<<<<<< ChangeLog
+2007-03-27  John W. Eaton  <jwe@octave.org>
+
+	* version.h (OCTAVE_VERSION): Now 2.9.10+
+
 2007-03-27  John W. Eaton  <jwe@octave.org>
 
 	* version.h (OCTAVE_VERSION): Now 2.9.10.
@@ -18,12 +21,10 @@
 	arg to X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS.
 	(OCTAVE_STARTUP_MESSAGE): Put info about news last.
 
-=======
 2007-03-27  John W. Eaton  <jwe@octave.org>
 
 	* Makefile.in (dist, conf-dist): Use ln, not $(LN_S).
 
->>>>>>> 1.1688
 2007-03-26  Juhani Saastamoinen  <juhani@cs.joensuu.fi>
 
 	* file-io.cc (do_stream_open) [! HAVE_ZLIB]:
diff --git a/src/version.h b/src/version.h
--- a/src/version.h
+++ b/src/version.h
@@ -25,7 +25,7 @@
 #if !defined (octave_version_h)
 #define octave_version_h 1
 
-#define OCTAVE_VERSION "2.9.10"
+#define OCTAVE_VERSION "2.9.10+"
 
 #define OCTAVE_API_VERSION "api-v23"