From 4fb60125fba90a4da3f116314f21f4a17d2787f3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 11 Oct 2014 07:49:52 -0400 Subject: [PATCH] 4.2.11-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 7eedad5e20..18fd9667d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.2.11.0 (not yet released) + 4.2.10.0 (not yet released) - bug #4361 Can't change font size (when config.inc.php not present) - bug #4542 Tab key in column name not shown diff --git a/README b/README index 16267d601f..2233e54b76 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.10-dev +Version 4.2.11-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index b308f0078f..cf10d02cc6 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.10-dev' +version = '4.2.11-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index d06bba8585..6ed4046c35 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.10-dev'); + $this->set('PMA_VERSION', '4.2.11-dev'); /** * @deprecated */