[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-271-g52f6015

[Marc Delisle]

The branch, QA_3_5 has been updated
       via  52f60156cb8ddc5a24fbd7c0a43c856f00391d38 (commit)
      from  34d01c91073384ab28713fc8a599d5df6978e08e (commit)


- Log -----------------------------------------------------------------
commit 52f60156cb8ddc5a24fbd7c0a43c856f00391d38
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Jan 28 04:06:37 2012 -0500

    Put back correct version in this branch (was lost during commit f196b4804d8e96386a822e68927e2103956a868f)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |    2 --
 Documentation.html         |    4 ++--
 README                     |    2 +-
 libraries/Config.class.php |    2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53c143a..08694de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 8fafa5f..49f6ec1 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>
diff --git a/README b/README
index f1ba37a..5e1d40b 100644
--- a/README
+++ b/README
@@ -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 635a02e..8235d83 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
          */


hooks/post-receive
-- 
phpMyAdmin