diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 23:48:38 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 23:57:08 +0200 |
| commit | efbc02acf30e1a98db9b7123610c593fe8fa6832 (patch) | |
| tree | b37f3b040ad69ea8848235dbb8f84c34e90c24b9 /build | |
| parent | f6b4aec9d07e1ea8ebfaf0271b2c0c3ac0364978 (diff) | |
| parent | 49a53755e6da8a8dc5ff09ba1768c9069a00ef52 (diff) | |
| download | forums-efbc02acf30e1a98db9b7123610c593fe8fa6832.tar forums-efbc02acf30e1a98db9b7123610c593fe8fa6832.tar.gz forums-efbc02acf30e1a98db9b7123610c593fe8fa6832.tar.bz2 forums-efbc02acf30e1a98db9b7123610c593fe8fa6832.tar.xz forums-efbc02acf30e1a98db9b7123610c593fe8fa6832.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
[prep-release-3.0.11] Bumping version number for 3.0.11-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 1b8d42a660..4a3799d143 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.11-RC1" /> + <property name="newversion" value="3.0.11-RC2" /> <property name="prevversion" value="3.0.10" /> - <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.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.9, 3.0.11-RC1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |