diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-08-20 16:42:41 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-08-20 16:42:41 +0200 |
| commit | bfdba90a34ad95c7cb9e0bc187cb464c83f8ba59 (patch) | |
| tree | 9efedfbc7926ec7dee5ad19a07be9b1dc676cd25 /build | |
| parent | 310c9069328172a7c0cb890d96b5eb4d14523e78 (diff) | |
| parent | 446607ef534650987bcda4e65023cfc1d290e794 (diff) | |
| download | forums-bfdba90a34ad95c7cb9e0bc187cb464c83f8ba59.tar forums-bfdba90a34ad95c7cb9e0bc187cb464c83f8ba59.tar.gz forums-bfdba90a34ad95c7cb9e0bc187cb464c83f8ba59.tar.bz2 forums-bfdba90a34ad95c7cb9e0bc187cb464c83f8ba59.tar.xz forums-bfdba90a34ad95c7cb9e0bc187cb464c83f8ba59.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.11] Bumping version number for 3.0.11 final.
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 4a3799d143..28dd36bea8 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-RC2" /> + <property name="newversion" value="3.0.11" /> <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, 3.0.11-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.9, 3.0.11-RC1, 3.0.11-RC2" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |