diff options
author | Marc Delisle <marc@infomarc.info> | 2012-01-28 13:06:37 +0400 |
---|---|---|
committer | Marc Delisle <marc@infomarc.info> | 2012-01-28 13:06:37 +0400 |
commit | 52f60156cb8ddc5a24fbd7c0a43c856f00391d38 (patch) | |
tree | 45ec0403ba0ace7080bec196b1d37c34c59244a0 | |
parent | 34d01c91073384ab28713fc8a599d5df6978e08e (diff) |
Put back correct version in this branch (was lost during commit f196b4804d8e96386a822e68927e2103956a868f)
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Documentation.html | 4 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | libraries/Config.class.php | 2 |
4 files changed, 4 insertions, 6 deletions
@@ -1,8 +1,6 @@ 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 8fafa5fc6d..49f6ec1e82 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.6.0-dev - Documentation</title> + <title>phpMyAdmin 3.5.0-beta2 - 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.6.0-dev + 3.5.0-beta2 Documentation </h1> </div> @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.6.0-dev +Version 3.5.0-beta2 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 635a02e7be..8235d83040 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.6.0-dev'); + $this->set('PMA_VERSION', '3.5.0-beta2'); /** * @deprecated */ |