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

2014-10-11 13:50:15 +02:00 · 2014-10-11 13:50:15 +02:00 · f1d862096d
commit f1d862096d
parent 6dcb49a959 4fb60125fb
4 changed files with 5 additions and 3 deletions
--- a/2
+++ b/2
@ -1,6 +1,8 @@
 phpMyAdmin - ChangeLog
 ======================

+4.2.11.0 (not yet released)
+
 4.2.10.0 (not yet released)
 - bug #4361 Can't change font size (when config.inc.php not present)
 - bug #4542 Tab key in column name not shown
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================

-Version 4.2.10-dev
+Version 4.2.11-dev

 A set of PHP-scripts to manage MySQL over the web.

--- a/doc/conf.py
+++ b/doc/conf.py
@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.2.10-dev'
+version = '4.2.11-dev'
 # The full version, including alpha/beta/rc tags.
 release = version

--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@ -114,7 +114,7 @@ class PMA_Config
     */
    function checkSystem()
    {
-        $this->set('PMA_VERSION', '4.2.10-dev');
+        $this->set('PMA_VERSION', '4.2.11-dev');
        /**
         * @deprecated
         */