diff --git a/ChangeLog b/ChangeLog index c9fc16dd2..7d9e6d490 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 645f86e70..83d013463 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.4.6-rc1 - Documentation + phpMyAdmin 3.4.6 - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index e94403e94..21967fbc8 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 77da8dd52..6bc1d00c1 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 */