From a80d0892f8c584aaf8e4cf3f505b178cfd82be51 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 12 Mar 2011 13:30:22 -0500 Subject: [PATCH 1/4] 3.3.10-rc1 --- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation.html b/Documentation.html index a80487a44..809a5aefe 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.3.10-dev - Documentation + phpMyAdmin 3.3.10-rc1 - Documentation @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 7849d82c9..d8dc68915 100644 --- a/README +++ b/README @@ -5,12 +5,12 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.10-dev + Version 3.3.10-rc1 ------------------ http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller - Copyright (C) 2001-2010 Marc Delisle + Copyright (C) 2001-2011 Marc Delisle Olivier Müller Robin Johnson Alexander M. Turek diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 8e3ff8b0d..f7beabca1 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.10-dev'); + $this->set('PMA_VERSION', '3.3.10-rc1'); /** * @deprecated */ diff --git a/translators.html b/translators.html index f47cdab84..a412679bb 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ - phpMyAdmin 3.3.10-dev - Official translators + phpMyAdmin 3.3.10-rc1 - Official translators @@ -19,7 +19,7 @@ From 0527c3ea78d869596ab90903850cbff8fbcc67fc Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 12 Mar 2011 13:33:43 -0500 Subject: [PATCH 2/4] 3.3.11-dev --- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation.html b/Documentation.html index a80487a44..229e8bb7e 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.3.10-dev - Documentation + phpMyAdmin 3.3.11-dev - Documentation @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 7849d82c9..33556dae1 100644 --- a/README +++ b/README @@ -5,12 +5,12 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.10-dev + Version 3.3.11-dev ------------------ http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller - Copyright (C) 2001-2010 Marc Delisle + Copyright (C) 2001-2011 Marc Delisle Olivier Müller Robin Johnson Alexander M. Turek diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 8e3ff8b0d..a08bc2792 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.10-dev'); + $this->set('PMA_VERSION', '3.3.11-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index f47cdab84..ed601f1d4 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ - phpMyAdmin 3.3.10-dev - Official translators + phpMyAdmin 3.3.11-dev - Official translators @@ -19,7 +19,7 @@ From 3e31ab117262a1d36c5dd0d57d9ec823289d20f9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 19 Mar 2011 07:54:50 -0400 Subject: [PATCH 3/4] 3.3.10 --- 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 06c64ab43..e42d62dba 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.10.0 (not yet released) +3.3.10.0 (2011-03-19) - patch #3147400 [structure] Aria table size printed as unknown, thanks to erickoh75 - erickoh75 - patch #3150164 [structure] Ordering by size gives incorrect results, diff --git a/Documentation.html b/Documentation.html index 809a5aefe..5b596c18b 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.3.10-rc1 - Documentation + phpMyAdmin 3.3.10 - Documentation @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index d8dc68915..00e24a8c0 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.10-rc1 - ------------------ + Version 3.3.10 + -------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f7beabca1..1a5521d6d 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.10-rc1'); + $this->set('PMA_VERSION', '3.3.10'); /** * @deprecated */ diff --git a/translators.html b/translators.html index a412679bb..5882a084c 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ - phpMyAdmin 3.3.10-rc1 - Official translators + phpMyAdmin 3.3.10 - Official translators @@ -19,7 +19,7 @@ From 86cdc9f7bb1334f47546159c2d83960ff36426a6 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 19 Mar 2011 07:58:11 -0400 Subject: [PATCH 4/4] 3.3.11-dev --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 06c64ab43..a3cd1f2cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,9 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ -3.3.10.0 (not yet released) +3.3.11.0 (not yet released) + +3.3.10.0 (2011-03-19) - patch #3147400 [structure] Aria table size printed as unknown, thanks to erickoh75 - erickoh75 - patch #3150164 [structure] Ordering by size gives incorrect results,