diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-26 22:25:39 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-26 22:26:59 +0100 |
| commit | 791464258f167a5fa0802e759f0141b1c0d45e39 (patch) | |
| tree | 98fd19aa09b88667b7f31a3d91434812ecd8fa61 /build | |
| parent | c4e29bde2331f5ade6883015b8ad90e70bdbd4d3 (diff) | |
| parent | 7520b2763973b7ca892bd8339acb98c894b57a1c (diff) | |
| download | forums-791464258f167a5fa0802e759f0141b1c0d45e39.tar forums-791464258f167a5fa0802e759f0141b1c0d45e39.tar.gz forums-791464258f167a5fa0802e759f0141b1c0d45e39.tar.bz2 forums-791464258f167a5fa0802e759f0141b1c0d45e39.tar.xz forums-791464258f167a5fa0802e759f0141b1c0d45e39.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.10] Bumping version number for 3.0.10-RC2.
Conflicts:
phpBB/install/database_update.php
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 c942142b5e..18b03243c2 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.0.10-RC1" /> + <property name="newversion" value="3.0.10-RC2" /> <property name="prevversion" value="3.0.9" /> - <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8" /> + <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.10-RC1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |