From 5a383c5be1e7b1b3ff3e6b1e7b7e16051f1052ed Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 25 Apr 2013 06:45:50 -0400 Subject: [PATCH] 4.0.1-dev --- ChangeLog | 2 ++ README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1eb0c5ab6d..62d8431b7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.0.1.0 (not yet released) + 4.0.0.0 (not yet released) + Patch #3481047 for rfe #3480477 Insert as new row enhancement + Patch #3480999 Activate codemirror in the query window diff --git a/README b/README index d9693d4762..c7f1af4a75 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.0.0-rc3 +Version 4.0.1-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 8b8f2c669c..45762e26cf 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -49,7 +49,7 @@ copyright = u'2012 - 2013, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.0.0-rc3' +version = '4.0.1-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 1787642b93..2b566c1341 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -101,7 +101,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.0.0-rc3'); + $this->set('PMA_VERSION', '4.0.1-dev'); /** * @deprecated */