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>2014-01-26 16:16:04 +0400
committerMarc Delisle <marc@infomarc.info>2014-01-26 16:16:04 +0400
commit22b6d41923ae63270e25175de2f7512cf264b3dc (patch)
treeae0dbfd2334553cb8786e764e7b6027c7ffe921e
parent806687331a08bf631c5ebc9dd72b5bbb2ffb44b9 (diff)
4.1.6 releaseRELEASE_4_1_6
Signed-off-by: Marc Delisle <marc@infomarc.info>
-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 709eab9f30..b3b7a6a92b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
-4.1.6.0 (not yet released)
+4.1.6.0 (2014-01-26)
- bug #4232 User not found after creating the user
- bug #4241 Confusing dialog when trying to create an already existing user
- bug #4239 Missing LIMIT clause for some queries
diff --git a/README b/README
index e6427484d8..f002c615fd 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.1.6-dev
+Version 4.1.6
A set of PHP-scripts to manage MySQL over the web.
diff --git a/doc/conf.py b/doc/conf.py
index adce81ea3c..aa106d09cc 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.1.6-dev'
+version = '4.1.6'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 4ad4f2995d..7cc3708413 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -114,7 +114,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '4.1.6-dev');
+ $this->set('PMA_VERSION', '4.1.6');
/**
* @deprecated
*/