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-05-31 20:30:06 +0400
committerMarc Delisle <marc@infomarc.info>2013-05-31 20:30:06 +0400
commit961515d50b20b9f640bb8f8486b0ee9771ad004d (patch)
tree82a2834f281cee9549a05137363552aaf3eb6f83
parent4781c3e10585fd27fc5892129288773da4e081fe (diff)
4.0.4-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 f59e546950..f8b8856d9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
phpMyAdmin - ChangeLog
======================
+4.0.4.0 (not yet released)
+
4.0.3.0 (not yet released)
- bug #3941 Recent tables list always empty
- bug #3933 Do not translate "Open Document" in export settings
diff --git a/README b/README
index 8a674616c4..2828c47ca9 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.0.3-dev
+Version 4.0.4-dev
A set of PHP-scripts to manage MySQL over the web.
diff --git a/doc/conf.py b/doc/conf.py
index 8db0a39ba8..e70488f84a 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.3-dev'
+version = '4.0.4-dev'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 9c13421353..2fc3d49fc5 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.3-dev');
+ $this->set('PMA_VERSION', '4.0.4-dev');
/**
* @deprecated
*/