# HG changeset patch
# User jwe
# Date 1154195653 0
# Node ID 84dc6800fcd89a14445ee1ea5ab0b1c2b9a9e9b1
# Parent  f47c0a988fe3130b7620ae99b3f1f10e0f47f79b
[project @ 2006-07-29 17:54:13 by jwe]

diff -r f47c0a988fe3 -r 84dc6800fcd8 src/ChangeLog
--- a/src/ChangeLog	Fri Jul 28 21:21:51 2006 +0000
+++ b/src/ChangeLog	Sat Jul 29 17:54:13 2006 +0000
@@ -1,3 +1,10 @@
+2006-07-29  John W. Eaton  <jwe@octave.org>
+
+	* matrix.h: Delete to avoid conflict with liboctave/Matrix.h on
+	case-insensitive filesystems.
+
+	* version.h (OCTAVE_VERSION): Now 2.9.7+.
+
 2006-07-28  John W. Eaton  <jwe@octave.org>
 
 	* version.h (OCTAVE_VERSION): Now 2.9.7.
diff -r f47c0a988fe3 -r 84dc6800fcd8 src/matrix.h
--- a/src/matrix.h	Fri Jul 28 21:21:51 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#include "mex.h"
diff -r f47c0a988fe3 -r 84dc6800fcd8 src/version.h
--- a/src/version.h	Fri Jul 28 21:21:51 2006 +0000
+++ b/src/version.h	Sat Jul 29 17:54:13 2006 +0000
@@ -25,7 +25,7 @@
 #if !defined (octave_version_h)
 #define octave_version_h 1
 
-#define OCTAVE_VERSION "2.9.7"
+#define OCTAVE_VERSION "2.9.7+"
 
 #define OCTAVE_API_VERSION "api-v20"