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

2015-09-09 11:09:10 +02:00 · 2015-09-09 11:09:10 +02:00 · 77c7a4da84
commit 77c7a4da84
parent fc5065c339 fe1d3ce9ba
4 changed files with 5 additions and 3 deletions
--- a/2
+++ b/2
@ -1,6 +1,8 @@
 phpMyAdmin - ChangeLog
 ======================

+4.5.1.0 (not yet released)
+
 4.5.0.0 (not yet released)
 + rfe          Pagination for GIS visualization
 + issue #6207  Usability improvements for console
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================

-Version 4.5.0-beta2
+Version 4.5.1-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.5.0-beta2'
+version = '4.5.1-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
     */
    public function checkSystem()
    {
-        $this->set('PMA_VERSION', '4.5.0-beta2');
+        $this->set('PMA_VERSION', '4.5.1-dev');
        /**
         * @deprecated
         */