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-06-17 20:25:41 +0400
committerMarc Delisle <marc@infomarc.info>2013-06-17 20:25:41 +0400
commit64c2b9a59c09e4a04be2238553c3fcfbc58b7949 (patch)
tree33deb1d7e5c53f05eb609df8fbbf4831c0007b34
parent5778f641b32d126ac4c363c2962764e63d5eae23 (diff)
4.0.4 releaseRELEASE_4_0_4
-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 f61fa30498..8b29aabbd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
-4.0.4.0 (not yet released)
+4.0.4.0 (2013-06-17)
- bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click
- bug #3961 Avoid Suhosin warning when in simulation mode
- bug #3897 Row Statistics and Space usage bugs
diff --git a/README b/README
index a91f210df4..94543f2884 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.0.4-rc1
+Version 4.0.4
A set of PHP-scripts to manage MySQL over the web.
diff --git a/doc/conf.py b/doc/conf.py
index 6347f3b6ed..372d845394 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.4-rc1'
+version = '4.0.4'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 12f4d28522..57b643ea3d 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -101,7 +101,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '4.0.4-rc1');
+ $this->set('PMA_VERSION', '4.0.4');
/**
* @deprecated
*/