From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Mon, 18 Jul 2005 15:49:57 +0000 (+0000)
Subject: back to 1.4.0cvs
X-Git-Tag: 1.6.10~14020
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=03f3596d128fc4da0fddb172b3c8cc1202875263;p=features.git

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 8a65585900..fda139334e 100644
--- 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 fecc88e735..db689d8fae 100644
--- 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