diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-01-21 16:07:22 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-01-21 16:07:22 +0100 |
| commit | 768d0a064108b8dfbc93e75e76deaf9d06e1466e (patch) | |
| tree | 16e51c1da8cd145a8935bbd165768345539f3480 /build | |
| parent | 28b2bbca16c50a70aea912fc8cb6d8a628828425 (diff) | |
| parent | 7ed065a630abab7ca1978e23eaa393130ed2c550 (diff) | |
| download | forums-768d0a064108b8dfbc93e75e76deaf9d06e1466e.tar forums-768d0a064108b8dfbc93e75e76deaf9d06e1466e.tar.gz forums-768d0a064108b8dfbc93e75e76deaf9d06e1466e.tar.bz2 forums-768d0a064108b8dfbc93e75e76deaf9d06e1466e.tar.xz forums-768d0a064108b8dfbc93e75e76deaf9d06e1466e.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[develop-olympus] Increment version number to 3.0.14-dev.
[develop-olympus] Add changelog for 3.0.13 release.
[develop-olympus] Bump version numbers for 3.0.13-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.13 releases.
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index 01a1dbdb96..5e839da636 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ <!-- a few settings for the build --> <property name="newversion" value="3.2.0-a1-dev" /> <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" /> + <property name="olderversions" value="3.0.12, 3.0.13-RC1, 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}" /> |