diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-25 00:06:08 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-25 00:06:08 +0200 |
| commit | 19b4391eefb742b3682195231f732240adca48f1 (patch) | |
| tree | 8316d8989f94823114811074a01ccb25c437898a | |
| parent | 60cb10e62b098ab313d1ca681328ed304345846e (diff) | |
| download | forums-19b4391eefb742b3682195231f732240adca48f1.tar forums-19b4391eefb742b3682195231f732240adca48f1.tar.gz forums-19b4391eefb742b3682195231f732240adca48f1.tar.bz2 forums-19b4391eefb742b3682195231f732240adca48f1.tar.xz forums-19b4391eefb742b3682195231f732240adca48f1.zip | |
[prep-release-3.1.0-RC1] Update phpBB Version for RC2 development
| -rw-r--r-- | build/build.xml | 6 | ||||
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/build/build.xml b/build/build.xml index a9b1bfa8fa..f2668e2101 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-RC1" /> - <property name="prevversion" value="3.1.0-b4" /> - <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" /> + <property name="newversion" value="3.1.0-RC2-dev" /> + <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" /> <!-- 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 56fb402d4a..2287639aee 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-RC1'); +define('PHPBB_VERSION', '3.1.0-RC2-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 36483ff788..572720ff95 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-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC2-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'); |