The branch, QA_3_4 has been updated via 1b5461dc75db35efdb69e8a7fbdccb6a6e8e9e34 (commit) from 15f887a979a1a6323b9a7d50f0462c63f489e954 (commit)

- Log ----------------------------------------------------------------- commit 1b5461dc75db35efdb69e8a7fbdccb6a6e8e9e34 Author: Marc Delisle marc@infomarc.info Date: Fri Sep 2 12:42:55 2011 -0400

3.4.6-dev

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

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

diff --git a/ChangeLog b/ChangeLog index 20e1751..167760d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ======================

+3.4.6.0 (not yet released) + 3.4.5.0 (not yet released) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced diff --git a/Documentation.html b/Documentation.html index 1e11f8d..844dd7d 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-dev - Documentation</title> + <title>phpMyAdmin 3.4.6-dev - 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-dev + 3.4.6-dev Documentation </h1> </div> diff --git a/README b/README index 9c627c5..4c82229 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================

-Version 3.4.5-dev +Version 3.4.6-dev

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

diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f76d545..4cc2315 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-dev'); + $this->set('PMA_VERSION', '3.4.6-dev'); /** * @deprecated */

hooks/post-receive