[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-5-g9a8407e

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  9a8407e5ce1b8b904e48f2f49b292360ffbd40bf (commit)
      from  32cdee1d8ab988abc4f08a86bdb9067bb91fbe3c (commit)


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

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 99d7444..737897c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 phpMyAdmin - ChangeLog
 ======================
 
+3.4.2.0 (not yet released)
+
 3.4.1.0 (not yet released)
 - bug #3301108 [interface] Synchronize and already configured host
 - bug #3302457 Inline edit and $cfg['PropertiesIconic']
diff --git a/Documentation.html b/Documentation.html
index 6a3032e..3d095c0 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.1-dev - Documentation</title>
+    <title>phpMyAdmin 3.4.2-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.1-dev
+        3.4.2-dev
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index e448f18..5648c73 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.1-dev
+Version 3.4.2-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 b363089..29f85e4 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.1-dev');
+        $this->set('PMA_VERSION', '3.4.2-dev');
         /**
          * @deprecated
          */


hooks/post-receive
-- 
phpMyAdmin