The branch, QA_3_4 has been updated via c43babad7cbde73098ded7fe502027a1af731f4b (commit) from 29455fe79bc9896129d7004e0242c451f4a32cc8 (commit)

- Log ----------------------------------------------------------------- commit c43babad7cbde73098ded7fe502027a1af731f4b Author: Marc Delisle marc@infomarc.info Date: Thu Nov 24 17:05:44 2011 -0500

3.4.9-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 7c40e9d..dd66822 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ======================

+3.4.9.0 (not yet released) + 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) - bug #3426840 [interface] ENUM/SET editor can't handle commas in values diff --git a/Documentation.html b/Documentation.html index 1d938d9..c0952f0 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.8-dev - Documentation</title> + <title>phpMyAdmin 3.4.9-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.8-dev + 3.4.9-dev Documentation </h1> </div> diff --git a/README b/README index aecad4c..fb06935 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================

-Version 3.4.8-dev +Version 3.4.9-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 ed9d775..2539c4e 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.8-dev'); + $this->set('PMA_VERSION', '3.4.9-dev'); /** * @deprecated */

hooks/post-receive