4.2.1-dev

Signed-off-by: Marc Delisle <marc@infomarc.info>
phpmyadmin · Apr 27, 2014 · fc2cd8f · fc2cd8f
1 parent 4770f7e
commit fc2cd8f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,8 @@
 phpMyAdmin - ChangeLog
 ======================
 
+4.2.1.0 (not yet released)
+
 4.2.0.0 (not yet released)
 + rfe #1403 Export only triggers
 + rfe #1483 Export Server/Database/Table without triggers

diff --git a/README b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.2.0-beta1
+Version 4.2.1-dev
 
 A set of PHP-scripts to manage MySQL over the web.
 

diff --git a/doc/conf.py b/doc/conf.py
@@ -51,7 +51,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.2.0-beta1'
+version = '4.2.1-dev'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
@@ -114,7 +114,7 @@ function __construct($source = null)
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.2.0-beta1');
+        $this->set('PMA_VERSION', '4.2.1-dev');
         /**
          * @deprecated
          */