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-05-15 01:30:25 +0400
committerMarc Delisle <marc@infomarc.info>2013-05-15 01:30:25 +0400
commit3df57a818917737d65e0e1c7cce80e9eb69e5e0b (patch)
treea27d63b2f756bd3e9e9a188108e5b3934ccc70a0
parentea596b07ebf6c07f5510ebb5f256286ca21a0b6f (diff)
4.0.1 releaseRELEASE_4_0_1
-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 8a7c16accf..9c4461ffd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
-4.0.1.0 (not yet released)
+4.0.1.0 (2013-05-14)
- bug #3879 Import broken for CSV using LOAD DATA
- bug #3889 When login fails and error display is active, login data is displayed
- bug #3890 [import] Web server upload directory import fails
diff --git a/README b/README
index 775253e342..6e792408df 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.0.1-rc1
+Version 4.0.1
A set of PHP-scripts to manage MySQL over the web.
diff --git a/doc/conf.py b/doc/conf.py
index 651cc31f22..c13fa271f8 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.1-rc1'
+version = '4.0.1'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index b89ab2f325..a81e369541 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.1-rc1');
+ $this->set('PMA_VERSION', '4.0.1');
/**
* @deprecated
*/