Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

2013-05-10 14:02:40 +02:00 · 2013-05-10 14:02:40 +02:00 · 2d9ca2645a
commit 2d9ca2645a
parent 141141af73 9fa18175fd
4 changed files with 5 additions and 3 deletions
--- a/2
+++ b/2
@ -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
--- a/2
+++ b/2
@ -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.

--- 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

--- 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
         */