The branch, TESTING has been updated via 5b26eb105fa0e54792f30134cc2333af5ced8382 (commit) via cdf76774d1773c5ceea8686a8c4ea1352ebc1ca5 (commit) from 71fb9910bde652c1024de0bd4936ccf71180941b (commit) - Log ----------------------------------------------------------------- commit 5b26eb105fa0e54792f30134cc2333af5ced8382 Merge: 71fb9910bde652c1024de0bd4936ccf71180941b cdf76774d1773c5ceea8686a8c4ea1352ebc1ca5 Author: Marc Delisle <marc@infomarc.info> Date: Mon Oct 25 12:22:14 2010 -0400 Merge branch 'MAINT_3_3_8' into TESTING ----------------------------------------------------------------------- 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 2385125..4827fb6 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.8.0 (not yet released) +3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 - bug #3062455 [core] copy procedures and routines before tables diff --git a/Documentation.html b/Documentation.html index ab7ae27..a233ccd 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.8-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.8 - 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.8-rc1 + 3.3.8 Documentation </h1> </div> diff --git a/README b/README index c6c5507..967acde 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.8-rc1 - ----------------- + Version 3.3.8 + ------------- 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 df596ec..6594e3a 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.8-rc1'); + $this->set('PMA_VERSION', '3.3.8'); /** * @deprecated */ diff --git a/translators.html b/translators.html index a292bd1..598e218 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.8-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.8 - 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.8-rc1 + 3.3.8 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin