[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_4_8-51-g31998e7

[Marc Delisle]

The branch, TESTING has been updated
       via  31998e782b5f7eb7146076ec71e428e95a776c4e (commit)
       via  3550b5adee887540a44a31bd5654f8c93d98d408 (commit)
      from  230f4ed39612515c20b1e91c05c2d0198a356567 (commit)


- Log -----------------------------------------------------------------
commit 31998e782b5f7eb7146076ec71e428e95a776c4e
Merge: 230f4ed 3550b5a
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Dec 1 12:21:25 2011 -0500

    Merge branch 'MAINT_3_4_8' into TESTING

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

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

diff --git a/ChangeLog b/ChangeLog
index f45b137..38ca784 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-3.4.8.0 (not yet released)
+3.4.8.0 (2011-12-01)
 - bug #3425230 [interface] enum data split at space char (more space to edit)
 - bug #3426840 [interface] ENUM/SET editor can't handle commas in values
 - bug #3427256 [interface] no links to browse/empty views and tables
diff --git a/Documentation.html b/Documentation.html
index 3d9f3c3..87a65d2 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.8-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.4.8 - 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.8-rc1
+        3.4.8
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 65349d8..12e5e4e 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.8-rc1
+Version 3.4.8
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index bd02527..cbcb3e4 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.8-rc1');
+        $this->set('PMA_VERSION', '3.4.8');
         /**
          * @deprecated
          */


hooks/post-receive
-- 
phpMyAdmin