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-08-04 14:26:47 +0400
committerMarc Delisle <marc@infomarc.info>2013-08-04 14:26:47 +0400
commit2fecc279f5d51e00a203cd400ace24b6053969a4 (patch)
tree6adf484aa3bfe37e4ac5f155e1f4352184f48331
parent9e59203274322dbac29eb1b1b59066bbf2e70273 (diff)
4.0.5 releaseRELEASE_4_0_5
-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 09098b22f5..bccf719137 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
-4.0.5.0 (not yet released)
+4.0.5.0 (2013-08-04)
- bug #3977 Not detected configuration storage
- bug #3970 Pressing enter in the filter field reloads page
- bug #3984 Cannot insert in this table (PHP < 5.4)
diff --git a/README b/README
index 934f8f84aa..2f6c1376b1 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.0.5-rc2
+Version 4.0.5
A set of PHP-scripts to manage MySQL over the web.
diff --git a/doc/conf.py b/doc/conf.py
index 2bb5d38529..f935741a9e 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.5-rc2'
+version = '4.0.5'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 375ab17705..d5c9c337ed 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.5-rc2');
+ $this->set('PMA_VERSION', '4.0.5');
/**
* @deprecated
*/