[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_9-21-gbadc93d

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  badc93d5d4eb2dcd02f6898e13977dafe11425db (commit)
      from  3c7b233d9c83b501f5e220a6dcba8259b7554a87 (commit)


- Log -----------------------------------------------------------------
commit badc93d5d4eb2dcd02f6898e13977dafe11425db
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Jan 24 12:28:06 2012 -0500

    Maybe 3.4.11 ?

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

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

diff --git a/ChangeLog b/ChangeLog
index a61a573..4e20e33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 phpMyAdmin - ChangeLog
 ======================
 
+3.4.11.0 (not yet released)
+
 3.4.10.0 (not yet released)
 - bug #3460090 [interface] TextareaAutoSelect feature broken
 - patch #3375984 [export] PHP Array export might generate invalid php code
diff --git a/Documentation.html b/Documentation.html
index 671c0fd..8731708 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.10-dev - Documentation</title>
+    <title>phpMyAdmin 3.4.11-dev - 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.10-dev
+        3.4.11-dev
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 68e7c99..aa9c279 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.10-dev
+Version 3.4.11-dev
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 090ee6a..f6d6c63 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.10-dev');
+        $this->set('PMA_VERSION', '3.4.11-dev');
         /**
          * @deprecated
          */


hooks/post-receive
-- 
phpMyAdmin