The branch, master has been updated via 09605e2d816117abe4da3cf47336bd692abb1726 (commit) from 65a72fbeeccaa30c083a0282057f3d1f4ac4db20 (commit)

- Log ----------------------------------------------------------------- commit 09605e2d816117abe4da3cf47336bd692abb1726 Author: Marc Delisle marc@infomarc.info Date: Sat Mar 12 08:01:26 2011 -0500

3.4.0-rc1-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 1f2dd71..d912e9c 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-beta4 - Documentation</title> + <title>phpMyAdmin 3.4.0-rc1-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-beta4 + 3.4.0-rc1-dev Documentation </h1> </div> diff --git a/README b/README index 111ee20..d848e19 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================

-Version 3.4.0-beta4 +Version 3.4.0-rc1-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 96c002a..e791e31 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-beta4'); + $this->set('PMA_VERSION', '3.4.0-rc1-dev'); /** * @deprecated */

hooks/post-receive