diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-20 09:55:56 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-20 09:55:56 +0200 |
| commit | e23d2e7b2057bcbd2a2be61a4ee2c1127d8b46cb (patch) | |
| tree | 270b71ee7d5213cdc40e9c02d22d51877b1b8b58 /build | |
| parent | 0a6015ad4b3a0f0cb3528edc7836099f9d89fec4 (diff) | |
| parent | e00545588145e7d4d33cb9780673f36a6049f0eb (diff) | |
| download | forums-e23d2e7b2057bcbd2a2be61a4ee2c1127d8b46cb.tar forums-e23d2e7b2057bcbd2a2be61a4ee2c1127d8b46cb.tar.gz forums-e23d2e7b2057bcbd2a2be61a4ee2c1127d8b46cb.tar.bz2 forums-e23d2e7b2057bcbd2a2be61a4ee2c1127d8b46cb.tar.xz forums-e23d2e7b2057bcbd2a2be61a4ee2c1127d8b46cb.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
[prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
[prep-release-3.1.0-RC4] Prepare Changelog
[prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
[prep-release-3.1.0-RC4] Update version to 3.1.0-RC4
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index 8e968a908f..08b6fa0a08 100644 --- a/build/build.xml +++ b/build/build.xml @@ -3,8 +3,8 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> <property name="newversion" value="3.2.0-a1-dev" /> - <property name="prevversion" value="3.1.0-RC3" /> - <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, 3.1.0-RC2" /> + <property name="prevversion" value="3.1.0-RC4" /> + <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, 3.1.0-RC2, 3.1.0-RC3" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |