diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-15 19:46:28 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-15 19:46:28 +0200 |
| commit | aa0c70058b4deb4284d17ce961ccc9bf4cbe47e7 (patch) | |
| tree | e5db22ea8fb90b76156467e9e0dd56e79f1b14f7 | |
| parent | 79f757d4b74e5d8b8ec74d6eb4da74c6cc03d526 (diff) | |
| parent | 48e5e56146bdf1b2b30556e8fb353e7aa20f7fb6 (diff) | |
| download | forums-aa0c70058b4deb4284d17ce961ccc9bf4cbe47e7.tar forums-aa0c70058b4deb4284d17ce961ccc9bf4cbe47e7.tar.gz forums-aa0c70058b4deb4284d17ce961ccc9bf4cbe47e7.tar.bz2 forums-aa0c70058b4deb4284d17ce961ccc9bf4cbe47e7.tar.xz forums-aa0c70058b4deb4284d17ce961ccc9bf4cbe47e7.zip | |
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
[prep-release-3.0.9] Bumping version number for 3.0.9-RC2.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
| -rw-r--r-- | build/build.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index c22f41691b..30dfa0c8da 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.9-RC1" /> - <property name="prevversion" value="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" /> + <property name="newversion" value="3.0.9-RC2" /> + <property name="prevversion" value="3.0.9-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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |