the 1.1.5pre2 version

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@749 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 1114af0ae9229957bfa3d0b0a7063294ad910343..9dedecb12778319c79ba3bd73cb20d4039084daf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-19  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * LyX 1.1.5pre2 released
+
 2000-05-19  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/vspace.C (operator=): removed

diff --git a/src/version.h b/src/version.h
index af48fc9b2f52c5ea7fb82777d9c9994930b4a5fa..0ac91b5fa29f6782ee2d1712a301287c2cc4b323 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
 /* Version and release date definition */
-#define LYX_VERSION "1.1.5cvs"
-#define LYX_RELEASE "Wed, Apr 26, 2000"
+#define LYX_VERSION "1.1.5pre2"
+#define LYX_RELEASE "Fri, May 19, 2000"
 /* This version string is intended to be used in files created by LyX */
 #define LYX_DOCVERSION "LyX 1.1"