From be0d0f642febf272cbe21d4adbf7a133b226232d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 17 Jul 2014 18:08:17 -0400 Subject: [PATCH] 4.2.7-dev Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6089b4185..bb7e9cda0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.2.6.0 (not yet released) +4.2.7.0 (not yet released) + +4.2.6.0 (2014-07-17) - bug #4471 Undefined index warning with referenced column. - bug #4027 $cfg['MaxExactCount'] is ignored when BROWSING is back - bug #4482 Multi Column sorting (improved user experience) diff --git a/README b/README index 568498be65..9f1cbb8725 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.6-dev +Version 4.2.7-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 44ac20ded4..7dd6a63c5d 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.2.6-dev' +version = '4.2.7-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index d44304e20b..5b282b6a9b 100644 --- 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.6-dev'); + $this->set('PMA_VERSION', '4.2.7-dev'); /** * @deprecated */