[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_6, updated. RELEASE_3_4_5-37-g46a1afb

[Marc Delisle]

The branch, MAINT_3_4_6 has been updated
       via  46a1afb372782533d8b04d72ae4b9b13a1248c0a (commit)
      from  e27961b1b282677a541f42db17e615525caaf30d (commit)


- Log -----------------------------------------------------------------
commit 46a1afb372782533d8b04d72ae4b9b13a1248c0a
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Oct 3 12:34:18 2011 -0400

    Preparing for 3.4.6-rc1

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

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

diff --git a/Documentation.html b/Documentation.html
index dd5c999..645f86e 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.4.6-dev - Documentation</title>
+    <title>phpMyAdmin 3.4.6-rc1 - 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.4.6-dev
+        3.4.6-rc1
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 4c82229..e94403e 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.6-dev
+Version 3.4.6-rc1
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 4cc2315..77da8dd 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -96,7 +96,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.4.6-dev');
+        $this->set('PMA_VERSION', '3.4.6-rc1');
         /**
          * @deprecated
          */


hooks/post-receive
-- 
phpMyAdmin