diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-08-01 17:30:21 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-08-01 17:30:21 +0200 |
| commit | 02b4f1c8745ffd62eb438019a36c4148bddca802 (patch) | |
| tree | 3b59a948e6730730308fd0a93fec58a8d3c0917a /build | |
| parent | 4e1e5865d03c8c56060a7e4fb975f88329997672 (diff) | |
| parent | 0a73d64b9772971b7e43e989c659184ee20c5bc6 (diff) | |
| download | forums-02b4f1c8745ffd62eb438019a36c4148bddca802.tar forums-02b4f1c8745ffd62eb438019a36c4148bddca802.tar.gz forums-02b4f1c8745ffd62eb438019a36c4148bddca802.tar.bz2 forums-02b4f1c8745ffd62eb438019a36c4148bddca802.tar.xz forums-02b4f1c8745ffd62eb438019a36c4148bddca802.zip | |
Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
[prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC2.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
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 bb88bd3cfa..2285f32073 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.12-RC1" /> + <property name="newversion" value="3.0.12-RC2" /> <property name="prevversion" value="3.0.11" /> - <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.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, 3.0.10, 3.0.12-RC1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |