[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_3_8-11038-g782beab

The branch, QA_3_4 has been updated via 782beabb6a07f7ac3bead982b71794080107f25f (commit) from 95ca09282ff6126ae9ffe7e143101c3d154f2e51 (commit) - Log ----------------------------------------------------------------- commit 782beabb6a07f7ac3bead982b71794080107f25f Author: Marc Delisle &lt;marc(a)infomarc.info&gt; Date: Mon Nov 22 13:26:56 2010 -0500 3.4.1-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a10389..7492217 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +3.4.1.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 f6235e7..a890d76 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-dev - Documentation</title> + <title>phpMyAdmin 3.4.1-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-dev + 3.4.1-dev Documentation </h1> </div> diff --git a/README b/README index 7b92968..42a8e91 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. -Version 3.4.0-dev +Version 3.4.1-dev ----------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 16fe5a1..b363089 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-dev'); + $this->set('PMA_VERSION', '3.4.1-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 537824c..4b8d7bb 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.4.0-dev - Official translators</title> + <title>phpMyAdmin 3.4.1-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.4.0-dev + 3.4.1-dev official translators list </h1> </div> hooks/post-receive -- phpMyAdmin