diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-12-04 00:25:54 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-12-04 00:25:54 +0100 |
| commit | 3176dcbc05383ab7cb72e228ab7b2ea1929643ab (patch) | |
| tree | a67c4797443662f9bc52468d30394c1b9c9ce536 /build | |
| parent | 7d47670c23ecc38decda0a70d78e4d992239fdaf (diff) | |
| parent | 138f123bd81bdd25bde28ca46a9ebf1673ffaecd (diff) | |
| download | forums-3176dcbc05383ab7cb72e228ab7b2ea1929643ab.tar forums-3176dcbc05383ab7cb72e228ab7b2ea1929643ab.tar.gz forums-3176dcbc05383ab7cb72e228ab7b2ea1929643ab.tar.bz2 forums-3176dcbc05383ab7cb72e228ab7b2ea1929643ab.tar.xz forums-3176dcbc05383ab7cb72e228ab7b2ea1929643ab.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.10] Bumping version number for 3.0.10-RC3.
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 2c42e1e162..bf4c97297b 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-RC2" /> + <property name="newversion" value="3.0.10-RC3" /> <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, 3.0.10-RC1" /> + <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, 3.0.10-RC2" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |