From d31e966a43b31758cff708a068dded2d79e46118 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 8 Dec 2013 06:25:11 -0500 Subject: [PATCH] 4.1.1-dev Signed-off-by: Marc Delisle --- 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 7d9647438c..6cb5bb6ab1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.1.1.0 (not yet released) + 4.1.0.0 (not yet released) + rfe #499 On user creation, warn if the user already exists + Use indeterminate check all checkbox in server privileges diff --git a/README b/README index 3b6718d178..73dbe2f526 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.1.0-rc3 +Version 4.1.1-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 0aa16db352..a7cb4aa669 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.1.0-rc3' +version = '4.1.1-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index fbc03900fb..fe29ac762e 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.0-rc3'); + $this->set('PMA_VERSION', '4.1.1-dev'); /** * @deprecated */