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

2013-11-30 14:13:42 +01:00 · 2013-11-30 14:13:42 +01:00 · 38891e5d27
commit 38891e5d27
parent cac94c98b6 35ab010a46
3 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================

-Version 4.1.0-rc1
+Version 4.1.0-rc2

 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.1.0-rc1'
+version = '4.1.0-rc2'
 # 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.1.0-rc1');
+        $this->set('PMA_VERSION', '4.1.0-rc2');
        /**
         * @deprecated
         */