[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_4_7-48-gf445a93

[Marc Delisle]

The branch, TESTING has been updated
       via  f445a9383bd166924aa1701ac189d3a2df5806e6 (commit)
       via  a8a93c3e5af85dd0329e1a71b8bed664c9ec4bc2 (commit)
      from  affd1a06d21f48bef1d7f5da977c3cc76736f4e6 (commit)


- Log -----------------------------------------------------------------
commit f445a9383bd166924aa1701ac189d3a2df5806e6
Merge: affd1a0 a8a93c3
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Oct 23 08:17:42 2011 -0400

    Merge branch 'MAINT_3_4_7' into TESTING

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

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 3ae9857..834215c 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.7-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.4.7 - 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.7-rc1
+        3.4.7
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index e4da810..ae117eb 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.7-rc1
+Version 3.4.7
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 589e2f5..824d04c 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.7-rc1');
+        $this->set('PMA_VERSION', '3.4.7');
         /**
          * @deprecated
          */


hooks/post-receive
-- 
phpMyAdmin