From d1a067c4d9e9aed5f6e7dc59e3c2dec77e80f72a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 13 Apr 2014 06:34:10 -0400 Subject: [PATCH 1/2] 4.1.14-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 a05ae28d55..499233de28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.1.13.0 (not yet released) +4.1.14.0 (not yet released) + +4.1.13.0 (2014-04-13) - bug #4279 CTRL + up or down moves 2 fields - bug #4336 List server css style wrong - bug Missing value on the Status > Server page diff --git a/README b/README index cf8615a053..928fd5d1a4 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.1.13-dev +Version 4.1.14-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 8d81dd1f0f..1b7557b675 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.13-dev' +version = '4.1.14-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 1587773fc5..43fb6d65fd 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.13-dev'); + $this->set('PMA_VERSION', '4.1.14-dev'); /** * @deprecated */ From 87eca2dfae3d713f838b2d0156ca1656bead247c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 13 Apr 2014 06:36:03 -0400 Subject: [PATCH 2/2] 4.1.14-dev Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c8b1148a33..15d2116475 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,7 +49,9 @@ phpMyAdmin - ChangeLog Removed support for SQL Validator (SOAP service no longer offered) - bug #4352 Settings > Manage: incorrect messages -4.1.13.0 (not yet released) +4.1.14.0 (not yet released) + +4.1.13.0 (2014-04-13) - bug #4279 CTRL + up or down moves 2 fields - bug #4336 List server css style wrong - bug Missing value on the Status > Server page