From fe1d3ce9ba41027227c23103c3021c7fd463188b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 9 Sep 2015 05:08:59 -0400 Subject: [PATCH 1/2] 4.5.1-dev Signed-off-by: Marc Delisle --- 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 34c7b0b17d..a85b74102d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/README b/README index e3786bce91..1eba2efe6c 100644 --- a/README +++ b/README @@ -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. diff --git a/doc/conf.py b/doc/conf.py index af5a2f24dc..de04fbfad5 100644 --- 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 diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 58cd87d215..b02acfc272 100644 --- 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 */ From e61d5a905553316c2e57774b11fafff0bbd55650 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 9 Sep 2015 05:10:12 -0400 Subject: [PATCH 2/2] Fix merge conflict Signed-off-by: Marc Delisle --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1ff0bd6fc5..cbf2e50589 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ phpMyAdmin - ChangeLog 4.6.0.0 (not yet released) + issue #11456 Disabled storage engines +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