The branch, QA_3_5 has been updated via 6fc336b2ddf86e3de51e5c21efccbf25ff4ba386 (commit) from 6b51be97bdbe5bae80e04dd0123ec573e2501dd6 (commit)

- Log ----------------------------------------------------------------- commit 6fc336b2ddf86e3de51e5c21efccbf25ff4ba386 Author: Marc Delisle marc@infomarc.info Date: Wed Jan 25 05:49:35 2012 -0500

Starting 3.5.0-beta2

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

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

diff --git a/Documentation.html b/Documentation.html index c3dc159..49f6ec1 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.5.0-beta1 - Documentation</title> + <title>phpMyAdmin 3.5.0-beta2 - 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.5.0-beta1 + 3.5.0-beta2 Documentation </h1> </div> diff --git a/README b/README index 7e1c4c9..5e1d40b 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================

-Version 3.5.0-beta1 +Version 3.5.0-beta2

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

diff --git a/libraries/Config.class.php b/libraries/Config.class.php index ba8a7a7..8235d83 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -98,7 +98,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.5.0-beta1'); + $this->set('PMA_VERSION', '3.5.0-beta2'); /** * @deprecated */

hooks/post-receive