The branch, MAINT_3_3_10 has been updated via 3e31ab117262a1d36c5dd0d57d9ec823289d20f9 (commit) from a80d0892f8c584aaf8e4cf3f505b178cfd82be51 (commit)

- Log ----------------------------------------------------------------- commit 3e31ab117262a1d36c5dd0d57d9ec823289d20f9 Author: Marc Delisle marc@infomarc.info Date: Sat Mar 19 07:54:50 2011 -0400

3.3.10

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

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 06c64ab..e42d62d 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.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 809a5ae..5b596c1 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.10-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.10 - 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.10-rc1 + 3.3.10 Documentation </h1> </div> diff --git a/README b/README index d8dc689..00e24a8 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 <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f7beabc..1a5521d 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 a412679..5882a08 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.10-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.10 - 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.10-rc1 + 3.3.10 official translators list </h1> </div>

hooks/post-receive