diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-25 16:47:22 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-25 16:47:22 +0100 |
| commit | 1a0cba1099a554323391d7dc43004cbcaaf3ade8 (patch) | |
| tree | 7bf336e4acde626b03a1962d955a96b1070467ca /build/build.xml | |
| parent | 8f67892f5ef63144f394b6913aeaa9ca3479d33d (diff) | |
| parent | f4898b9258c8365f3aae7fc945c3f156ec9f0ad4 (diff) | |
| download | forums-1a0cba1099a554323391d7dc43004cbcaaf3ade8.tar forums-1a0cba1099a554323391d7dc43004cbcaaf3ade8.tar.gz forums-1a0cba1099a554323391d7dc43004cbcaaf3ade8.tar.bz2 forums-1a0cba1099a554323391d7dc43004cbcaaf3ade8.tar.xz forums-1a0cba1099a554323391d7dc43004cbcaaf3ade8.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/build.xml')
| -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 16798f0e97..01a1dbdb96 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.1" /> - <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, 3.1.0-RC5, 3.1.0-RC6, 3.1.0" /> + <property name="prevversion" value="3.1.2" /> + <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, 3.1.0-RC5, 3.1.0-RC6, 3.1.0, 3.1.1, 3.1.2-RC1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |