From 6be855a6c6c13f5f0b9c6d1ffa0941e326a7690c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 12 May 2014 08:03:14 -0400 Subject: [PATCH] 4.2.2-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 02730eae77..802340654d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.2.2.0 (not yet released) + 4.2.1.0 (not yet released) - bug #4380 Cannot display table structure with enums containing special characters - bug #4381 Cannot remove the last remembered sorted column diff --git a/README b/README index a0ea7470da..617aaab7ba 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.1-dev +Version 4.2.2-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 84fdb09e03..fc431f124a 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.1-dev' +version = '4.2.2-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 3c94822e45..88770a878a 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.1-dev'); + $this->set('PMA_VERSION', '4.2.2-dev'); /** * @deprecated */