Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2011-10-16 14:19:49 +0400
committerMarc Delisle <marc@infomarc.info>2011-10-16 14:19:49 +0400
commit7869e3c3b412d825e040bc5df18c6d0adc28f751 (patch)
treef64acb1fbdeae6ea203812ca946e0db9bd515415
parentca597dc423f3eebcca95ff33b088a03e39109115 (diff)
3.4.6 releaseRELEASE_3_4_6
-rw-r--r--ChangeLog2
-rw-r--r--Documentation.html4
-rw-r--r--README2
-rw-r--r--libraries/Config.class.php2
4 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c9fc16dd2b..7d9e6d490d 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 645f86e70e..83d0134637 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 e94403e94a..21967fbc8d 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 77da8dd52e..6bc1d00c1c 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
*/