diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-09-27 01:39:24 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-09-27 01:39:24 +0200 |
| commit | 8db820be634cfce0fdb079fdbaee2c49661a7870 (patch) | |
| tree | 9afb8f612114a89429eb04b0fe2242d1dbedbc1e /build | |
| parent | 56ee5973bc702beecb51e66c3f380be597828e6e (diff) | |
| parent | 50f6af2a207dc18c1e76b08201a5c9ea640e921f (diff) | |
| download | forums-8db820be634cfce0fdb079fdbaee2c49661a7870.tar forums-8db820be634cfce0fdb079fdbaee2c49661a7870.tar.gz forums-8db820be634cfce0fdb079fdbaee2c49661a7870.tar.bz2 forums-8db820be634cfce0fdb079fdbaee2c49661a7870.tar.xz forums-8db820be634cfce0fdb079fdbaee2c49661a7870.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.
[prep-release-3.0.12] Bumping version number for 3.0.12 final.
Conflicts:
build/build.xml
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 f8181160c1..f29be5326d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -3,8 +3,8 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> <property name="newversion" value="3.1.0-dev" /> - <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="prevversion" value="3.0.12-RC3" /> + <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.11" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |