From 48cf4d398d3b5667522ceb702827fe24061d43f0 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 13 Apr 2010 14:28:25 -0400 Subject: [PATCH 1/2] 3.3.2 release --- 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 ebe25bd7f..a5c87d33c 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.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 81e12b004..330161f53 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.3.2-rc1 - Documentation + phpMyAdmin 3.3.2 - Documentation @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 1ca0c383c..ae0af4486 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 diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 25b11202c..63b314a44 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 bca8cd590..00f7ab334 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ - phpMyAdmin 3.3.2-rc1 - Official translators + phpMyAdmin 3.3.2 - Official translators @@ -19,7 +19,7 @@ From b6132c51540b24d821641d0a2c7a749bbc55d813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 15 Apr 2010 09:21:02 +0200 Subject: [PATCH 2/2] Update year. --- Documentation.html | 2 +- translators.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation.html b/Documentation.html index 8848f90e3..c72c6902b 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4999,7 +4999,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai".