Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2013-06-13 21:41:49 +0400
committerMarc Delisle <marc@infomarc.info>2013-06-13 21:41:49 +0400
commit18b7f4e4d0deb26092c38e938728f98372ada4c4 (patch)
tree2751a63aaaa6fc0f6c2ba05cbf5d5f8ff187cc68
parent821a1373d7238f69018bec3d426ba5a73f159945 (diff)
4.0.5-dev
-rw-r--r--ChangeLog2
-rw-r--r--README2
-rw-r--r--doc/conf.py2
-rw-r--r--libraries/Config.class.php2
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
*/