From 6cf73f6bcaa2ff5bca4405f41e3bff57c1715b7e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 26 Mar 2012 11:24:28 -0400 Subject: [PATCH 1/2] 3.5.1-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 ee58277787..a722e04c39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +3.5.1.0 (not yet released) + 3.5.0.0 (not yet released) + rfe #2021981 [interface] Add support for mass prefix change. + "up to date" message on main page when current version is up to date diff --git a/Documentation.html b/Documentation.html index 877049f28f..cd5912b86e 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.5.0-rc2 - Documentation + phpMyAdmin 3.5.1-dev - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 5c75273f52..22a4e334ac 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.0-rc2 +Version 3.5.1-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 1872db1ada..cd28c9e56b 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.0-rc2'); + $this->set('PMA_VERSION', '3.5.1-dev'); /** * @deprecated */ From caeb7d452df565366d19916bbfbb06210c150e09 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 26 Mar 2012 11:25:17 -0400 Subject: [PATCH 2/2] 3.5.1-dev --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index f6c4450ba2..3c9fcc92eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,8 @@ phpMyAdmin - ChangeLog + Patch #3509360 Contest-3: Option "Truncate table" before "insert" + Patch #3506552 Contest-2: Show index information in the data dictionary +3.5.1.0 (not yet released) + 3.5.0.0 (not yet released) + rfe #2021981 [interface] Add support for mass prefix change. + "up to date" message on main page when current version is up to date