From 2e7f9b3cfacb49ba1f928f50e363c845af894575 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 28 Aug 2010 10:43:33 -0400
Subject: [PATCH] 3.3.6 release

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

diff --git a/ChangeLog b/ChangeLog
index 81670e91e4..24cc7577c4 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.6.0 (not yet released)
+3.3.6.0 (2010-08-28)
 - bug #3033063 [core] Navi gets wrong db name
 - bug #3031705 [core] Fix generating condition for real numbers by comparing
   them to string.
@@ -19,7 +19,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #3044189 [doc] Cleared documentation for hide_db.
 - bug #3042495 [core] Move PMA_sendHeaderLocation to core.lib.php.
 
-3.3.5.1 (2010-10-20)
+3.3.5.1 (2010-08-20)
 - [core] Fixed various XSS issues, see PMASA-2010-5 for more details.
 
 3.3.5.0 (2010-07-26)
diff --git a/Documentation.html b/Documentation.html
index 3ef61da61e..7cacfdbb10 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.6-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.3.6 - 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.6-rc1 
+        3.3.6 
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 141934b922..8810ad1477 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.6-rc1
-  -----------------
+  Version 3.3.6
+  -------------
   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 2dab78dedc..afd226ce63 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.6-rc1');
+        $this->set('PMA_VERSION', '3.3.6');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index f4d3a4bab5..c642c1152b 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.6-rc1 - Official translators</title>
+    <title>phpMyAdmin 3.3.6 - 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.6-rc1
+        3.3.6
         official translators list
     </h1>
 </div>
-- 
2.11.4.GIT