diff --git a/ChangeLog b/ChangeLog index 4ddba45eec..4fac09eabc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.1.5.0 (not yet released) +4.1.6.0 (not yet released) + +4.1.5.0 (2014-01-17) - bug #3780 Allow aborting loading pages - bug #4223 Database list: Create database misses collation column - bug #4224 Empty table names when a table is "inuse" diff --git a/README b/README index 615a94c554..e6427484d8 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.1.5-dev +Version 4.1.6-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 0f5614a9f9..adce81ea3c 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.5-dev' +version = '4.1.6-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 361495819a..46da6c871e 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.5-dev'); + $this->set('PMA_VERSION', '4.1.6-dev'); /** * @deprecated */