The branch, QA_3_4 has been updated via b939d1048ec3bebf066bcccafbcd3d2998db3521 (commit) from e27961b1b282677a541f42db17e615525caaf30d (commit)

- Log ----------------------------------------------------------------- -----------------------------------------------------------------------

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 239796f..9f4daa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ======================

+3.4.7.0 (not yet released) + 3.4.6.0 (not yet released) - patch #3404173 InnoDB comment display with tooltips/aliases - bug #3404886 [navi] Edit SQL statement after error diff --git a/Documentation.html b/Documentation.html index dd5c999..2938a3b 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.6-dev - Documentation</title> + <title>phpMyAdmin 3.4.7-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.6-dev + 3.4.7-dev Documentation </h1> </div> diff --git a/README b/README index 4c82229..caec19f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================

-Version 3.4.6-dev +Version 3.4.7-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 4cc2315..a6f4e12 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.6-dev'); + $this->set('PMA_VERSION', '3.4.7-dev'); /** * @deprecated */

hooks/post-receive