aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-04-28 20:40:20 +0200
committerAndreas Fischer <bantu@phpbb.com>2015-04-28 20:40:20 +0200
commit6d8df7332cac920b5e8dd7dedf971789d30bc3cb (patch)
tree39aad4945cd9993fee8056486755fbcfb82f6d65
parentd833f290694e7545c0c4168cbf6c565bd52c43ba (diff)
downloadforums-6d8df7332cac920b5e8dd7dedf971789d30bc3cb.tar
forums-6d8df7332cac920b5e8dd7dedf971789d30bc3cb.tar.gz
forums-6d8df7332cac920b5e8dd7dedf971789d30bc3cb.tar.bz2
forums-6d8df7332cac920b5e8dd7dedf971789d30bc3cb.tar.xz
forums-6d8df7332cac920b5e8dd7dedf971789d30bc3cb.zip
[3.0.x] Increment version number to 3.0.15-dev.
-rw-r--r--build/build.xml6
-rw-r--r--phpBB/includes/constants.php2
-rw-r--r--phpBB/install/database_update.php2
-rw-r--r--phpBB/install/schemas/schema_data.sql2
4 files changed, 6 insertions, 6 deletions
diff --git a/build/build.xml b/build/build.xml
index 27e34bf6bb..229f62a4c7 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
- <property name="newversion" value="3.0.14-RC1" />
- <property name="prevversion" value="3.0.13-PL1" />
- <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.10, 3.0.11, 3.0.12, 3.0.13" />
+ <property name="newversion" value="3.0.15-dev" />
+ <property name="prevversion" value="3.0.14-RC1" />
+ <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.10, 3.0.11, 3.0.12, 3.0.13, 3.0.13-PL1" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 97943574cb..fdf5df58cc 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-define('PHPBB_VERSION', '3.0.14-RC1');
+define('PHPBB_VERSION', '3.0.15-dev');
// QA-related
// define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index f81576fea6..f0fd321a7a 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
*
*/
-define('UPDATES_TO_VERSION', '3.0.14-RC1');
+define('UPDATES_TO_VERSION', '3.0.15-dev');
// Enter any version to update from to test updates. The version within the db will not be updated.
define('DEBUG_FROM_VERSION', false);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 462ba0c3ff..a80f29c561 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.14-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.15-dev');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');