[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-90-g210b763

[Marc Delisle]

The branch, QA_3_3 has been updated
       via  210b7631da5ddd30ae2d46e90226bc0b2c39d3a0 (commit)
      from  1f62ea1932a3b4d39cbc64d5b2dcaab81ead78d7 (commit)


- Log -----------------------------------------------------------------
commit 210b7631da5ddd30ae2d46e90226bc0b2c39d3a0
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Apr 6 13:00:48 2010 -0400

    3.3.3-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 eb437d1..354d1b1 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.3.0 (not yet released)
+
 3.3.2.0 (not yet released)
 - patch #2969449 [core] Name for MERGE engine varies depending on the
   MySQL version, thanks to Dieter Adriaenssens - ruleant
diff --git a/Documentation.html b/Documentation.html
index 34f1bbd..a33e865 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.2-dev - Documentation</title>
+    <title>phpMyAdmin 3.3.3-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.2-dev 
+        3.3.3-dev 
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index c462c54..19c8a90 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.2-dev
+  Version 3.3.3-dev
   -----------------
   http://www.phpmyadmin.net/
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 9430145..57d4964 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.2-dev');
+        $this->set('PMA_VERSION', '3.3.3-dev');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index 034ed2b..ee017b6 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.2-dev - Official translators</title>
+    <title>phpMyAdmin 3.3.3-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.2-dev 
+        3.3.3-dev 
         official translators list
     </h1>
 </div>


hooks/post-receive
-- 
phpMyAdmin