From 404d826e4fe5108a67e0a2b07341ab8378b3fe49 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 24 Apr 2012 07:29:06 -0400 Subject: [PATCH 1/2] 3.5.1-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 1a18b323fd..c19f934312 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.5.1-dev - Documentation + phpMyAdmin 3.5.1-rc1 - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 22a4e334ac..903b5b2fbe 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.1-dev +Version 3.5.1-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 cd28c9e56b..4f46763fc0 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.1-dev'); + $this->set('PMA_VERSION', '3.5.1-rc1'); /** * @deprecated */ From abf645b0a30f20b0f873d98820c1002ef6d36805 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 24 Apr 2012 07:33:31 -0400 Subject: [PATCH 2/2] 3.5.2-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 7ec8f40e05..7ca25a8910 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +3.5.2.0 (not yet released) + 3.5.1.0 (not yet released) - bug #3510784 [edit] Limit clause ignored when sort order is remembered - bug #3511471 [interface] View name not seen in navi panel (MySQL 5.1) diff --git a/Documentation.html b/Documentation.html index c19f934312..cc0a6b034f 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.5.1-rc1 - Documentation + phpMyAdmin 3.5.2-dev - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 903b5b2fbe..a0d52e010f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.1-rc1 +Version 3.5.2-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 4f46763fc0..702f78f39f 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.1-rc1'); + $this->set('PMA_VERSION', '3.5.2-dev'); /** * @deprecated */