From 35c24b29332a8cdfc702cf44c479a678a39c630b Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 18 Jul 2000 13:21:00 +0000
Subject: [PATCH] Ready for 1.1.5fix1

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/lyx-1_1_5@895 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog     | 6 ++++++
 src/version.h | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e05db9f64..f966178e01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-18  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* version 1.1.5fix1 released.
+
+	* src/version.h: update version number
+
 2000-07-17  Kayvan Sylvan <ksylvan@synopsys.com>
 
 	* configure.in: do not forget to put a space after -isystem.
diff --git a/src/version.h b/src/version.h
index 1dc4c4ca93..8570753912 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
 /* Version and release date definition */
-#define LYX_VERSION "1.1.5fixcvs"
-#define LYX_RELEASE "Tue, Jun 6, 2000"
+#define LYX_VERSION "1.1.5fix1"
+#define LYX_RELEASE "Tue Jul 18, 2000"
 /* This version string is intended to be used in files created by LyX */
 #define LYX_DOCVERSION "LyX 1.1"