changeset 5918:84dc6800fcd8

[project @ 2006-07-29 17:54:13 by jwe]
author jwe
date Sat, 29 Jul 2006 17:54:13 +0000
parents f47c0a988fe3
children ceaf10a4743c
files src/ChangeLog src/matrix.h src/version.h
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
deleted file mode 100644
--- a/src/matrix.h
+++ /dev/null
@@ -1,1 +0,0 @@
-#include "mex.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.7"
+#define OCTAVE_VERSION "2.9.7+"
 
 #define OCTAVE_API_VERSION "api-v20"