From 5df1eb1c83474221d87bf23eeeca5a4971219eec Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 22 Feb 2014 07:14:02 -0500 Subject: [PATCH] 4.1.9-dev Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- README | 2 +- doc/conf.py | 4 ++-- libraries/Config.class.php | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18046c27bc..f9d1a75ee2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.1.8.0 (not yet released) +4.1.9.0 (not yet released) + +4.1.8.0 (2014-02-22) - bug #4276 Login loop on session expiry - bug #4249 Incorrect number of result rows for SQL with subqueries - bug #4275 Broken Link to php extension manual diff --git a/README b/README index 9874a71b44..c1d861051f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.1.8-dev +Version 4.1.9-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 218b2c1f67..d0d07bbe9e 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -42,14 +42,14 @@ master_doc = 'index' # General information about the project. project = u'phpMyAdmin' -copyright = u'2012 - 2013, The phpMyAdmin devel team' +copyright = u'2012 - 2014, The phpMyAdmin devel team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '4.1.8-dev' +version = '4.1.9-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 1c0612e20f..30478c0002 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.8-dev'); + $this->set('PMA_VERSION', '4.1.9-dev'); /** * @deprecated */