The branch, MAINT_3_3_2 has been updated via 48cf4d398d3b5667522ceb702827fe24061d43f0 (commit) from e5ceb497df8563f73296d7fc894ff00101e21bde (commit)

- Log ----------------------------------------------------------------- commit 48cf4d398d3b5667522ceb702827fe24061d43f0 Author: Marc Delisle marc@infomarc.info Date: Tue Apr 13 14:28:25 2010 -0400

3.3.2 release

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

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 ebe25bd..a5c87d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/C... $

-3.3.2.0 (not yet released) +3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the MySQL version, thanks to Dieter Adriaenssens - ruleant - bug #2966078 [browse] Incorrect LIMIT is saved and sticks while browsing diff --git a/Documentation.html b/Documentation.html index 81e12b0..330161f 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-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.2 - 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-rc1 + 3.3.2 Documentation </h1> </div> diff --git a/README b/README index 1ca0c38..ae0af44 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.2-rc1 - ----------------- + Version 3.3.2 + ------------- 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 25b1120..63b314a 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-rc1'); + $this->set('PMA_VERSION', '3.3.2'); /** * @deprecated */ diff --git a/translators.html b/translators.html index bca8cd5..00f7ab3 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-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.2 - 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-rc1 + 3.3.2 official translators list </h1> </div>

hooks/post-receive