diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-07 22:12:37 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-07 22:12:37 +0200 |
| commit | 9d6cef2225f704bbaee40b21d4ef74a112285016 (patch) | |
| tree | cc5aefce5c6389b9331d667a3075ec1bb1b8dbab /build | |
| parent | 10e99b018a6ecd43f1ffdfafb67b2e4303fd19b1 (diff) | |
| parent | 5b186c936d6d6d67b8b0551a990522fdc68e2a4c (diff) | |
| download | forums-9d6cef2225f704bbaee40b21d4ef74a112285016.tar forums-9d6cef2225f704bbaee40b21d4ef74a112285016.tar.gz forums-9d6cef2225f704bbaee40b21d4ef74a112285016.tar.bz2 forums-9d6cef2225f704bbaee40b21d4ef74a112285016.tar.xz forums-9d6cef2225f704bbaee40b21d4ef74a112285016.zip | |
Merge branch 'develop-ascraeus' into develop
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index 894ef6ebb2..9ac109b013 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,10 @@ <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-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" /> + <property name="prevversion" value="3.1.0-RC5" /> + <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, 3.1.0-RC4" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |