[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-34-g828d008

[Marc Delisle]

The branch, QA_3_3 has been updated
       via  828d008838565b1980c67e82ff48eb087a0bcb9a (commit)
      from  0b9cf14f754935696b6068b238ecc5ed3d3749fd (commit)


- Log -----------------------------------------------------------------
commit 828d008838565b1980c67e82ff48eb087a0bcb9a
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Jul 18 14:34:32 2010 -0400

    3.3.6-dev

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

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

diff --git a/ChangeLog b/ChangeLog
index 2b0c93f..3f1afa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
+3.3.6.0 (not yet released)
+
 3.3.5.0 (not yet released)
 - patch #2932113 [information_schema] Slow export when having lots of
   databases, thanks to Stéphane Pontier - shadow_walker
diff --git a/Documentation.html b/Documentation.html
index 1968285..8d001e2 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -10,7 +10,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.3.5-dev - Documentation</title>
+    <title>phpMyAdmin 3.3.6-dev - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -18,7 +18,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.3.5-dev 
+        3.3.6-dev 
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 2df920b..8be673e 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 3.3.5-dev
+  Version 3.3.6-dev
   -----------------
   http://www.phpmyadmin.net/
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index a7b448b..a6b1d8c 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -92,7 +92,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.3.5-dev');
+        $this->set('PMA_VERSION', '3.3.6-dev');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index ec250a8..d78b68b 100644
--- a/translators.html
+++ b/translators.html
@@ -11,7 +11,7 @@
     <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.3.5-dev - Official translators</title>
+    <title>phpMyAdmin 3.3.6-dev - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -19,7 +19,7 @@
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.3.5-dev 
+        3.3.6-dev 
         official translators list
     </h1>
 </div>


hooks/post-receive
-- 
phpMyAdmin