From 036549a8dea2c98d728f84f158dc184c377d2c50 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 31 Oct 2014 12:29:34 -0400 Subject: [PATCH] 4.2.12-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 e2407a4a2d..ae861c6b2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.2.11.0 (not yet released) +4.2.12.0 (not yet released) + +4.2.11.0 (2014-10-31) - bug ReferenceError: Table_onover is not defined - bug #4552 Incorrect routines display for database due to case insensitive checks - bug #4259 reCaptcha sound session expired problem diff --git a/README b/README index 2233e54b76..31b0369a4f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.11-dev +Version 4.2.12-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index cf10d02cc6..e606112d5d 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.11-dev' +version = '4.2.12-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 6ed4046c35..a8adc06b60 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.11-dev'); + $this->set('PMA_VERSION', '4.2.12-dev'); /** * @deprecated */