diff options
author | Marc Delisle <marc@infomarc.info> | 2014-05-08 15:17:46 +0400 |
---|---|---|
committer | Marc Delisle <marc@infomarc.info> | 2014-05-08 15:17:46 +0400 |
commit | 2df5f88ea8a59485befb02d6763e96d4666a0887 (patch) | |
tree | 99f5d3a0caa7aeed14e0c7c9abe1f923a7313b63 | |
parent | 3d6362a294a26b94005fe26eb9af018a54399ebb (diff) |
4.2.0 releaseRELEASE_4_2_0
Signed-off-by: Marc Delisle <marc@infomarc.info>
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | doc/conf.py | 2 | ||||
-rw-r--r-- | libraries/Config.class.php | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -4.2.0.0 (not yet released) +4.2.0.0 (2014-05-08) + rfe #1403 Export only triggers + rfe #1483 Export Server/Database/Table without triggers + rfe #1662 Add table comment tool tip in database structure page @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.0-rc1 +Version 4.2.0 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 2fc01711e4..4f719cde54 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.2.0-rc1' +version = '4.2.0' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 44d631e1c6..8217f43d98 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.2.0-rc1'); + $this->set('PMA_VERSION', '4.2.0'); /** * @deprecated */ |