[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_3_3-4-gc7b61bd

Marc Delisle lem9 at users.sourceforge.net
Mon May 10 18:53:23 CEST 2010


The branch, TESTING has been updated
       via  c7b61bdab3ffe3bb58bef54370a8d1d9c8f90c3b (commit)
       via  38445bef624fe105dce758d20b5fad8ec70c950c (commit)
      from  80dc561011fe54101cb1d7b4665e224d9101cc93 (commit)


- Log -----------------------------------------------------------------
commit c7b61bdab3ffe3bb58bef54370a8d1d9c8f90c3b
Merge: 80dc561011fe54101cb1d7b4665e224d9101cc93 38445bef624fe105dce758d20b5fad8ec70c950c
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon May 10 12:33:06 2010 -0400

    Merge branch 'MAINT_3_3_3' into TESTING

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

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

diff --git a/ChangeLog b/ChangeLog
index 7772eb6..ad395fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
-3.3.3.0 (not yet released)
+3.3.3.0 (2010-05-10)
 - patch #2982480 [navi] Do not group if there would be one table in group,
   thanks to Lorikeet Lee.
 - patch #2983492 [sync] When asking to synchronize Structure and Data,
diff --git a/Documentation.html b/Documentation.html
index 2297d29..d8aa720 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.3-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.3.3 - 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.3-rc1 
+        3.3.3
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 674ddef..9edfc16 100644
--- a/README
+++ b/README
@@ -5,8 +5,8 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 3.3.3-rc1
-  -----------------
+  Version 3.3.3
+  -------------
   http://www.phpmyadmin.net/
 
     Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 2e12514..549775a 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.3-rc1');
+        $this->set('PMA_VERSION', '3.3.3');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index d08bf66..813fd02 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.3-rc1 - Official translators</title>
+    <title>phpMyAdmin 3.3.3 - 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.3-rc1 
+        3.3.3
         official translators list
     </h1>
 </div>


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list