From f0cb0e7dab3666f5cafd98a88365868e89d70bea Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 12 Feb 2013 14:53:05 -0500 Subject: [PATCH 1/2] 3.5.7-rc1 --- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 3262363073..78b88e0c31 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.5.7-dev - Documentation + phpMyAdmin 3.5.7-rc1 - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 538d6701b4..16ad2355ca 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.7-dev +Version 3.5.7-rc1 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index c3c51467ab..641166bc33 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -98,7 +98,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.5.7-dev'); + $this->set('PMA_VERSION', '3.5.7-rc1'); /** * @deprecated */ From e8cb50db52298cdb211527aaab63b3accbdc71d3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 12 Feb 2013 14:55:16 -0500 Subject: [PATCH 2/2] 3.5.8-dev --- ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4153c0fcb3..fc10ec9deb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +3.5.8.0 (not yet released) + 3.5.7.0 (not yet released) - bug #3779 [core] Problem with backslash in enum fields - bug #3816 Missing server_processlist.php diff --git a/Documentation.html b/Documentation.html index 3262363073..5e0b87433f 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.5.7-dev - Documentation + phpMyAdmin 3.5.8-dev - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 538d6701b4..06490376ef 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.7-dev +Version 3.5.8-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index c3c51467ab..34bb504d5b 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -98,7 +98,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.5.7-dev'); + $this->set('PMA_VERSION', '3.5.8-dev'); /** * @deprecated */