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:
authorIsaac Bennetch <bennetch@gmail.com>2016-03-17 12:47:44 +0300
committerIsaac Bennetch <bennetch@gmail.com>2016-03-17 12:47:44 +0300
commit37b38431d167915675fc8ab512470528147e72de (patch)
tree94b8528ce8af4f056834afeb826bdfb36c82f2bb
parentbe3137c77af2b029ad349d9bca80bcd72b369f04 (diff)
4.6.0 releaseRELEASE_4_6_0
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
-rw-r--r--ChangeLog2
-rw-r--r--README2
-rw-r--r--doc/conf.py2
-rw-r--r--libraries/Config.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fb29c50ab4..bad8beb898 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
-4.6.0.0 (not yet released)
+4.6.0.0 (2016-03-22)
+ issue #11456 Disabled storage engines
+ issue #11479 Allow setting routine wise privileges
- issue Hide Insert tab for non-updatable views
diff --git a/README b/README
index 806de8f143..b21789d920 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.6.0-rc2
+Version 4.6.0
A web interface for MySQL and MariaDB.
diff --git a/doc/conf.py b/doc/conf.py
index 6dbc3a42c2..09ee0e5f2c 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team'
# built documents.
#
# The short X.Y version.
-version = '4.6.0-rc2'
+version = '4.6.0'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.php b/libraries/Config.php
index 2e4efaf773..12e6563559 100644
--- a/libraries/Config.php
+++ b/libraries/Config.php
@@ -101,7 +101,7 @@ class Config
*/
public function checkSystem()
{
- $this->set('PMA_VERSION', '4.6.0-rc2');
+ $this->set('PMA_VERSION', '4.6.0');
/**
* @deprecated
*/