diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-12 10:17:47 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-12 10:17:47 +0200 |
| commit | 483b40dfa3b67471b1e9b912233d8a0c3c11f23c (patch) | |
| tree | a5e335a6d0c0ad446b30def9f334d49d5f57fdd5 /build | |
| parent | a60d4b250798bfd8e974746dcb3d6b5a81f063ed (diff) | |
| parent | e47b7540c3def5635bd33614122c70f13588580c (diff) | |
| download | forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.tar forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.tar.gz forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.tar.bz2 forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.tar.xz forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
[prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
[prep-release-3.1.0-RC3] Prepare Changelog
[prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
[prep-release-3.1.0-RC3] Update version to 3.1.0-RC3
Conflicts:
phpBB/styles/subsilver2/style.cfg
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index 9b088982e8..991d344331 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-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" /> + <property name="newversion" value="3.1.0-RC4-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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |