From 519024e05c16f6a586d139539b9c71dde08935bc Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 25 Jan 2012 05:19:15 -0500 Subject: [PATCH] Starting 3.6.0 --- 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 08694de8e9..53c143a7bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +3.6.0.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 c4f5c96554..8fafa5fc6d 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-beta1-dev - Documentation + phpMyAdmin 3.6.0-dev - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index c18603bf32..f1ba37ab11 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.0-beta1-dev +Version 3.6.0-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 67756e4f7e..635a02e7be 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-beta1-dev'); + $this->set('PMA_VERSION', '3.6.0-dev'); /** * @deprecated */ -- 2.11.4.GIT