aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-07-11 17:22:16 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-07-11 17:22:16 +0200
commitb5492a07da70be20ce64f9f9c080f58089b5ca9a (patch)
treef214fa7a86aeedf0dd8ecaab4b4e9a35ca5425ee
parent4dc26274bfa799516d9b3bd3c7a296ef8b6141bb (diff)
downloadforums-b5492a07da70be20ce64f9f9c080f58089b5ca9a.tar
forums-b5492a07da70be20ce64f9f9c080f58089b5ca9a.tar.gz
forums-b5492a07da70be20ce64f9f9c080f58089b5ca9a.tar.bz2
forums-b5492a07da70be20ce64f9f9c080f58089b5ca9a.tar.xz
forums-b5492a07da70be20ce64f9f9c080f58089b5ca9a.zip
[prep-release-3.1.0-RC2] Update phpBB Version for RC3 development
-rw-r--r--build/build.xml6
-rw-r--r--phpBB/includes/constants.php2
-rw-r--r--phpBB/install/schemas/schema_data.sql2
3 files changed, 5 insertions, 5 deletions
diff --git a/build/build.xml b/build/build.xml
index 8f779a4b5d..3c1a3e4db4 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.1.0-RC2" />
- <property name="prevversion" value="3.1.0-RC1" />
- <property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4" />
+ <property name="newversion" value="3.1.0-RC3-dev" />
+ <property name="prevversion" value="3.1.0-RC2" />
+ <property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4, 3.1.0-RC1" />
<!-- 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 c5070dde4e..cd4e19bf1d 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-define('PHPBB_VERSION', '3.1.0-RC2');
+define('PHPBB_VERSION', '3.1.0-RC3-dev');
// QA-related
// define('PHPBB_QA', 1);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 6707d3b0f9..9cc151f728 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -273,7 +273,7 @@ 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 ('use_system_cron', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC2');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC3-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');