The branch, master has been updated via 5381b2f600f9574ff149628316d67c40be53565d (commit) from c13f25d4913821eb48b7f0372a06743abb92b0b1 (commit)

- Log ----------------------------------------------------------------- commit 5381b2f600f9574ff149628316d67c40be53565d Author: Marc Delisle marc@infomarc.info Date: Sat Apr 16 13:40:46 2011 -0400

3.4.0-rc2-dev

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

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 8e35ab3..887b8a0 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.0-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.0-rc2-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.0-rc1 + 3.4.0-rc2-dev Documentation </h1> </div> diff --git a/README b/README index d64950d..3b3f355 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================

-Version 3.4.0-rc1 +Version 3.4.0-rc2-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 008b274..85fa390 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.0-rc1'); + $this->set('PMA_VERSION', '3.4.0-rc2-dev'); /** * @deprecated */

hooks/post-receive