The branch, TESTING has been updated via 7fcea707b97d89ef7c74009b135a7f9911b28368 (commit) via 7869e3c3b412d825e040bc5df18c6d0adc28f751 (commit) from 0f0307038ceb24c442d72444e4da8f58fa23969d (commit)
- Log ----------------------------------------------------------------- commit 7fcea707b97d89ef7c74009b135a7f9911b28368 Merge: 0f03070 7869e3c Author: Marc Delisle marc@infomarc.info Date: Sun Oct 16 06:26:49 2011 -0400
Merge branch 'MAINT_3_4_6' into TESTING
-----------------------------------------------------------------------
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 4165a5a..1d45ea9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ======================
-3.4.6.0 (not yet released) +3.4.6.0 (2011-10-16) - patch #3404173 InnoDB comment display with tooltips/aliases - bug #3404886 [navi] Edit SQL statement after error - bug #3403165 [interface] Collation not displayed for long enum fields diff --git a/Documentation.html b/Documentation.html index 645f86e..83d0134 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.6-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.6 - 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.6-rc1 + 3.4.6 Documentation </h1> </div> diff --git a/README b/README index e94403e..21967fb 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================
-Version 3.4.6-rc1 +Version 3.4.6
A set of PHP-scripts to manage MySQL over the web.
diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 77da8dd..6bc1d00 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.6-rc1'); + $this->set('PMA_VERSION', '3.4.6'); /** * @deprecated */
hooks/post-receive