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>2013-09-05 20:31:23 +0400
committerMarc Delisle <marc@infomarc.info>2013-09-05 20:31:23 +0400
commit21eda1c2c42d28370b91c99017dcee7eef9691fd (patch)
tree7c65735d0114a5bcf10d8c5da4cb4a5c26a0437e
parent1bab8bfeeaf508cbe5fb8ff7ed1b910b7faca3eb (diff)
4.0.6 releaseRELEASE_4_0_6
-rw-r--r--ChangeLog2
-rw-r--r--README2
-rw-r--r--doc/conf.py2
-rw-r--r--libraries/Config.class.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e5a677c1c3..27f1af2c68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
-4.0.6.0 (not yet released)
+4.0.6.0 (2013-09-05)
- bug #4036 Call to undefined function mb_detect_encoding (clarify the doc)
- bug Missing hints when changing a column's structure
- bug #4048 Cannot select foreign value in Search
diff --git a/README b/README
index 49d5d82d3b..09dbef08e6 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.0.6-rc2
+Version 4.0.6
A set of PHP-scripts to manage MySQL over the web.
diff --git a/doc/conf.py b/doc/conf.py
index 476e591072..04dd40bda5 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@ copyright = u'2012 - 2013, The phpMyAdmin devel team'
# built documents.
#
# The short X.Y version.
-version = '4.0.6-rc2'
+version = '4.0.6'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 86b7dd1501..8ee567a113 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -102,7 +102,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '4.0.6-rc2');
+ $this->set('PMA_VERSION', '4.0.6');
/**
* @deprecated
*/