From 1d20cb24b8d1fbce51a78293bb6a787d4fa6d684 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 10 May 2013 08:00:18 -0400 Subject: [PATCH 1/3] 4.0.1-rc1 --- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index c7f1af4a75..775253e342 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.0.1-dev +Version 4.0.1-rc1 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 45762e26cf..651cc31f22 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.1-dev' +version = '4.0.1-rc1' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 0a5744efad..b89ab2f325 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.1-dev'); + $this->set('PMA_VERSION', '4.0.1-rc1'); /** * @deprecated */ From 9fa18175fd842dfdf5a8a6643931b2b0ab82e7ae Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 10 May 2013 08:02:02 -0400 Subject: [PATCH 2/3] 4.0.2-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 c744491bfe..496ccbad05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.0.2.0 (not yet released) + 4.0.1.0 (not yet released) - bug #3879 Import broken for CSV using LOAD DATA - bug #3889 When login fails and error display is active, login data is displayed diff --git a/README b/README index c7f1af4a75..562d5b6085 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.0.1-dev +Version 4.0.2-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 45762e26cf..9aa113ae04 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.1-dev' +version = '4.0.2-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 0a5744efad..9671a345a4 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.1-dev'); + $this->set('PMA_VERSION', '4.0.2-dev'); /** * @deprecated */ From 1cc7fe8d102358e8409f172e3ad4c2fa0928ef6d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 10 May 2013 08:02:56 -0400 Subject: [PATCH 3/3] Fix merge conflicts --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index cf8e6ef183..87d9742d04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ phpMyAdmin - ChangeLog + PMA_DBI functions in database interface libraries renamed to be compliant with PEAR standards + rfe #1412 Creating a view from an empty set of results +4.0.2.0 (not yet released) + 4.0.1.0 (not yet released) - bug #3879 Import broken for CSV using LOAD DATA - bug #3889 When login fails and error display is active, login data is displayed