The branch, master has been updated via a93399b8a43cec0eb4b25d4a7b759a32a9350a1e (commit) from 40c48e0853c1188584962cc2acfca94968d0e9ac (commit)

- Log ----------------------------------------------------------------- commit a93399b8a43cec0eb4b25d4a7b759a32a9350a1e Author: Marc Delisle marc@infomarc.info Date: Thu Dec 2 07:37:12 2010 -0500

the goal of master is currently to stabilize 3.4.0

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

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

diff --git a/ChangeLog b/ChangeLog index b9e81a8..2c791ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,6 @@ phpMyAdmin - ChangeLog ======================

-3.5.0.0 (not yet released) - 3.4.0.0 (not yet released) + rfe #2890226 [view] Enable VIEW rename + rfe #838637 [privileges] Export a user's privileges diff --git a/Documentation.html b/Documentation.html index 3479ad2..2b57c7f 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-dev - Documentation</title> + <title>phpMyAdmin 3.4.0-alpha3-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.5.0-dev + 3.4.0-alpha3-dev Documentation </h1> </div> diff --git a/README b/README index fccd68b..95f1741 100644 --- a/README +++ b/README @@ -3,8 +3,8 @@ phpMyAdmin - Readme

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

-Version 3.5.0-dev ------------------ +Version 3.4.0-alpha3-dev +------------------------

http://www.phpmyadmin.net/

diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 4c2f281..a024a4d 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.5.0-dev'); + $this->set('PMA_VERSION', '3.4.0-alpha3-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index c2ba840..47f23c7 100644 --- a/translators.html +++ b/translators.html @@ -10,7 +10,7 @@ <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-dev - Official translators</title> + <title>phpMyAdmin 3.4.0-alpha3-dev - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head>

@@ -18,7 +18,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.5.0-dev + 3.4.0-alpha3-dev official translators list </h1> </div>

hooks/post-receive