The branch, MAINT_3_4_1 has been updated via 8c1fbf450500a6903aab062c837139baf3a7296b (commit) from 89c8f3cbfe5356995ad71e5a41438e81fa994a55 (commit)

- Log ----------------------------------------------------------------- commit 8c1fbf450500a6903aab062c837139baf3a7296b Author: Marc Delisle marc@infomarc.info Date: Fri May 20 13:16:42 2011 -0400

3.4.1

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

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

diff --git a/ChangeLog b/ChangeLog index f6b479f..278d4cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ======================

-3.4.1.0 (not yet released) +3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host - bug #3302457 Inline edit and $cfg['PropertiesIconic'] - Patch #3302313 Show a translated label diff --git a/Documentation.html b/Documentation.html index 0b30194..d9627dd 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.1-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.1 - 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.1-rc1 + 3.4.1 Documentation </h1> </div> diff --git a/README b/README index d728493..2d0d4c1 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================

-Version 3.4.1-rc1 +Version 3.4.1

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

diff --git a/libraries/Config.class.php b/libraries/Config.class.php index d0f4903..73a379b 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.1-rc1'); + $this->set('PMA_VERSION', '3.4.1'); /** * @deprecated */

hooks/post-receive