diff --git a/ChangeLog b/ChangeLog index 900163b9a..a84ae335b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ +3.3.0.0 (not yet released) + 3.2.0.0 (not yet released) - [core] better support for vendor customisation (based on what Debian needs) + rfe #2127987 warn when session.gc_maxlifetime is less than cookie validity diff --git a/Documentation.html b/Documentation.html index 868bc45d2..757f0b6da 100644 --- a/Documentation.html +++ b/Documentation.html @@ -11,7 +11,7 @@ - phpMyAdmin 3.2.0-dev - Documentation + phpMyAdmin 3.3.0-dev - Documentation @@ -19,7 +19,7 @@ diff --git a/README b/README index c22ffb2f9..4b147cc4e 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.2.0-dev + Version 3.3.0-dev ----------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 17eacb3c2..a3dc64cd2 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.2.0-dev'); + $this->set('PMA_VERSION', '3.3.0-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 74d340d04..89ba7ee18 100644 --- a/translators.html +++ b/translators.html @@ -8,7 +8,7 @@ - phpMyAdmin 3.2.0-dev - Official translators + phpMyAdmin 3.3.0-dev - Official translators @@ -16,7 +16,7 @@