From 5778f641b32d126ac4c363c2962764e63d5eae23 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 13 Jun 2013 13:40:16 -0400 Subject: [PATCH 1/2] 4.0.4-rc1 --- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 2828c47ca9..a91f210df4 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.0.4-dev +Version 4.0.4-rc1 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index e70488f84a..6347f3b6ed 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.4-dev' +version = '4.0.4-rc1' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 2fc3d49fc5..12f4d28522 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.4-dev'); + $this->set('PMA_VERSION', '4.0.4-rc1'); /** * @deprecated */ From 18b7f4e4d0deb26092c38e938728f98372ada4c4 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 13 Jun 2013 13:41:49 -0400 Subject: [PATCH 2/2] 4.0.5-dev --- ChangeLog | 2 ++ README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f61fa30498..7ce867af7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.0.5.0 (not yet released) + 4.0.4.0 (not yet released) - bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click - bug #3961 Avoid Suhosin warning when in simulation mode diff --git a/README b/README index 2828c47ca9..d196203845 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.0.4-dev +Version 4.0.5-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index e70488f84a..3f9aba4375 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.4-dev' +version = '4.0.5-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 2fc3d49fc5..2ebf0d6882 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.4-dev'); + $this->set('PMA_VERSION', '4.0.5-dev'); /** * @deprecated */