The branch, master has been updated via 44f99c2f47166f753ecd23a00404207b3a2be29b (commit) from c46844e4ae79533998348201518198d710aea894 (commit)

- Log ----------------------------------------------------------------- commit 44f99c2f47166f753ecd23a00404207b3a2be29b Author: Marc Delisle marc@infomarc.info Date: Fri Jan 7 11:16:29 2011 -0500

Working on 3.4.0-beta3

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

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 e81d0aa..4612561 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-beta2 - Documentation</title> + <title>phpMyAdmin 3.4.0-beta3-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-beta2 + 3.4.0-beta3-dev Documentation </h1> </div> diff --git a/README b/README index f8d274b..bebc3c8 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================

-Version 3.4.0-beta2 +Version 3.4.0-beta3-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 de7e61a..f55dc55 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-beta2'); + $this->set('PMA_VERSION', '3.4.0-beta3-dev'); /** * @deprecated */

hooks/post-receive