The branch, QA_3_4 has been updated via 871aaa9b641714af2137de5d67c137c8017580bd (commit) via cc99e0405536b2d886897c269a4877c05ba156f9 (commit) from 08ee54d4a43b1bd6eff1e6695ff8553e6f26b37a (commit)

- Log ----------------------------------------------------------------- commit 871aaa9b641714af2137de5d67c137c8017580bd Author: Marc Delisle marc@infomarc.info Date: Mon Jul 25 10:12:37 2011 -0400

3.4.5-dev

commit cc99e0405536b2d886897c269a4877c05ba156f9 Author: Marc Delisle marc@infomarc.info Date: Mon Jul 25 10:08:10 2011 -0400

3.4.5 started

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

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 551eb8d..03daef0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ======================

+3.4.5.0 (not yet released) + 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes - bug #3323101 [parser] Invalid escape sequence in SQL parser diff --git a/Documentation.html b/Documentation.html index 23efaa9..d7f2501 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.4-dev - Documentation</title> + <title>phpMyAdmin 3.4.5-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.4-dev + 3.4.5-dev Documentation </h1> </div> diff --git a/README b/README index 0695551..9c627c5 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================

-Version 3.4.4-dev +Version 3.4.5-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 f9e10f0..f76d545 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.4-dev'); + $this->set('PMA_VERSION', '3.4.5-dev'); /** * @deprecated */

hooks/post-receive