back to 1.4.0cvs

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

diff --git a/ChangeLog b/ChangeLog
index 8a65585900935863291312c7975b182647ebedf9..fda139334e4c716dd0e40623bfecf67ff183dbf1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-18  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * configure.ac: version back to 1.4.0cvs 
+
 2005-07-18  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * configure.ac: set version to 1.4.0pre1

diff --git a/configure.ac b/configure.ac
index fecc88e735c833e7c4964bbe191d9fb5970d01bb..db689d8fae088c029939851b3731b2da2d6837cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(lyx,1.4.0pre1,lyx-devel@lists.lyx.org)
+AC_INIT(lyx,1.4.0cvs,lyx-devel@lists.lyx.org)
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.C)
 AM_CONFIG_HEADER([src/config.h])
@@ -8,7 +8,7 @@ AM_CONFIG_HEADER([src/config.h])
 AC_CONFIG_AUX_DIR(config)
 
 PACKAGE=lyx${program_suffix}
-VERSION="1.4.0pre1"
+VERSION="1.4.0cvs"
 LYX_CHECK_VERSION
 
 dnl default maintainer mode to true for development versions