From 2df5f88ea8a59485befb02d6763e96d4666a0887 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 8 May 2014 13:17:46 +0200 Subject: [PATCH 1/2] 4.2.0 release Signed-off-by: Marc Delisle --- ChangeLog | 2 +- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3703d45374..0af4f12605 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/README b/README index 2ca9d3acd1..0f9d925d96 100644 --- a/README +++ b/README @@ -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 */ From 61d014ad2fec8ff1e9a452ea6d323b6d779a7786 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 8 May 2014 13:19:22 +0200 Subject: [PATCH 2/2] 4.2.0 release Signed-off-by: Marc Delisle --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6f92092a5e..4a1b9dae7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,7 @@ phpMyAdmin - ChangeLog - bug #4384 Incorrect "Rows" total shown when truncating or dropping a table on DB Structure page - bug #4385 Grid edit on sorted columns fails -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