From 8978ac5bcc0202889fd05d3ec1d98cfe70655e26 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 22 Mar 2014 06:54:45 -0400 Subject: [PATCH] 4.1.11-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 5d5e6d0a83..abe062ebb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.1.10.0 (not yet released) +4.1.11.0 (not yet released) + +4.1.10.0 (2014-03-22) - bug #4301 Grid edit: "SELECT" query is replaced by "UPDATE" query after edit - bug #4278 reCaptcha re-login requires double effort - bug #4324 Datepicker not showing up on insert page diff --git a/README b/README index a575321eb5..b0ba433738 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.1.10-dev +Version 4.1.11-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index e3fcd65f76..07e54cc28d 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -49,7 +49,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.1.10-dev' +version = '4.1.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 0be4ff8468..d543f81b9d 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.1.10-dev'); + $this->set('PMA_VERSION', '4.1.11-dev'); /** * @deprecated */