The branch, master has been updated via 519024e05c16f6a586d139539b9c71dde08935bc (commit) from 86a64b69a471ba9605a37a41a05f4ba94345b874 (commit)
- Log ----------------------------------------------------------------- commit 519024e05c16f6a586d139539b9c71dde08935bc Author: Marc Delisle marc@infomarc.info Date: Wed Jan 25 05:19:15 2012 -0500
Starting 3.6.0
-----------------------------------------------------------------------
Summary of changes: 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 08694de..53c143a 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 c4f5c96..8fafa5f 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.5.0-beta1-dev - Documentation</title> + <title>phpMyAdmin 3.6.0-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head>
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.5.0-beta1-dev + 3.6.0-dev Documentation </h1> </div> diff --git a/README b/README index c18603b..f1ba37a 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 67756e4..635a02e 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 */
hooks/post-receive