The branch, master has been updated via c46844e4ae79533998348201518198d710aea894 (commit) from 653debdc0ec11df4ab7934b9bac3262edd879812 (commit)

- Log ----------------------------------------------------------------- commit c46844e4ae79533998348201518198d710aea894 Author: Marc Delisle marc@infomarc.info Date: Fri Jan 7 10:41:07 2011 -0500

3.4.0-beta2

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

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

diff --git a/Documentation.html b/Documentation.html index e43875c..e81d0aa 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-beta1 - Documentation</title> + <title>phpMyAdmin 3.4.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.4.0-beta1 + 3.4.0-beta2 Documentation </h1> </div> diff --git a/README b/README index 3fab3f9..f8d274b 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================

-Version 3.4.0-beta1 +Version 3.4.0-beta2

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

@@ -13,7 +13,7 @@ Copyright Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>

-Copyright (C) 2001-2010 +Copyright (C) 2001-2011 Marc Delisle <marc_at_infomarc.info> Olivier Müller <om_at_omnis.ch> Robin Johnson <robbat2_at_users.sourceforge.net> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index b2bff78..de7e61a 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-beta1'); + $this->set('PMA_VERSION', '3.4.0-beta2'); /** * @deprecated */

hooks/post-receive