The branch, TESTING has been updated via 64ade534925c4e32b725ca58a4bd1e6fba333326 (commit) via 08a6fd9c12f1520518b044d87e2a4da189649580 (commit) via 97716f5a5a8b2ac24d2965e6b8faf6b747616d85 (commit) from e795d42205feea5032654414fb8618aa42343d44 (commit)

- Log ----------------------------------------------------------------- commit 64ade534925c4e32b725ca58a4bd1e6fba333326 Merge: e795d42205feea5032654414fb8618aa42343d44 08a6fd9c12f1520518b044d87e2a4da189649580 Author: Marc Delisle marc@infomarc.info Date: Mon Jan 3 07:07:54 2011 -0500

Merge branch 'MAINT_3_3_9' into TESTING

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

Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 17 ++++++++++++----- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog index a12e057..c110734 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,7 +128,7 @@ - bug #3119882 [interface] Display query chart on demand. - [interface] Use less noisy message and remove disable link on server charts and database statistics.

-3.3.9.0 (not yet released) +3.3.9.0 (2011-01-03) - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand - bug #3103853 [js] Double quotes were not escaped in generated js diff --git a/Documentation.html b/Documentation.html index 4b44689..d1dba8c 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,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.9-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.9 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head>

@@ -17,7 +17,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.9-rc1 + 3.3.9 Documentation </h1> </div> diff --git a/README b/README index 9ccf2d5..76f66ab 100644 --- a/README +++ b/README @@ -25,13 +25,20 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, as published by the Free Software Foundation.

- Version 3.3.9-rc1 - ----------------- + Version 3.3.9 + ------------- http://www.phpmyadmin.net/

-You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> + Copyright (C) 2001-2011 Marc Delisle <marc_at_infomarc.info> + Olivier Müller <om_at_omnis.ch> + Robin Johnson <robbat2_at_users.sourceforge.net> + Alexander M. Turek <me_at_derrabus.de> + Michal Čihař <michal_at_cihar.com> + Garvin Hicking <me_at_supergarv.de> + Michael Keck <mkkeck_at_users.sourceforge.net> + Sebastian Mendel <cybot_tm_at_users.sourceforge.net> + [check Documentation.txt/.html file for more details]

Requirements ~~~~~~~~~~~~ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 40ff7ae..6c6c72b 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.9-rc1'); + $this->set('PMA_VERSION', '3.3.9'); /** * @deprecated */ diff --git a/translators.html b/translators.html index fdefa36..9efc661 100644 --- a/translators.html +++ b/translators.html @@ -10,7 +10,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.9-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.9 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head>

@@ -18,7 +18,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.9-rc1 + 3.3.9 official translators list </h1> </div>

hooks/post-receive