The branch, TESTING has been updated via 8cec66133fdb06172991e8017e4dda6e445bd8c1 (commit) via b7d09b5bb865816bb357ceb357f6beb52d20afde (commit) from 9ea5d25434fdca3d71eefedf80ac143c799b0bf9 (commit)

- Log ----------------------------------------------------------------- commit 8cec66133fdb06172991e8017e4dda6e445bd8c1 Merge: 9ea5d25 b7d09b5 Author: Marc Delisle marc@infomarc.info Date: Wed Sep 14 07:48:45 2011 -0400

Merge branch 'MAINT_3_4_5' into TESTING

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

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

diff --git a/ChangeLog b/ChangeLog index 3076156..b307b54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ======================

-3.4.5.0 (not yet released) +3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing diff --git a/Documentation.html b/Documentation.html index 019939e..bfeeca6 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.4.5-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.5 - 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.4.5-rc1 + 3.4.5 Documentation </h1> </div> diff --git a/README b/README index a836068..0206e1f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================

-Version 3.4.5-rc1 +Version 3.4.5

A set of PHP-scripts to manage MySQL over the web.

diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 96fd61d..e6c6c26 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.4.5-rc1'); + $this->set('PMA_VERSION', '3.4.5'); /** * @deprecated */

hooks/post-receive