diff options
author | Andreas Fischer <bantu@phpbb.com> | 2011-07-10 23:11:29 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-10 23:11:29 +0200 |
commit | 09e0460e5b53f83f4c06703c8bd8f1cb0f22eb48 (patch) | |
tree | b86e32d9ef53c5e45458f091aa3d6be1dcf7113a /build | |
parent | e2d27a30a6fa2eafb1950f171bad1f6b69fce758 (diff) | |
parent | e4707a8be75263e610b00b3d600144e797f576d9 (diff) | |
download | forums-09e0460e5b53f83f4c06703c8bd8f1cb0f22eb48.tar forums-09e0460e5b53f83f4c06703c8bd8f1cb0f22eb48.tar.gz forums-09e0460e5b53f83f4c06703c8bd8f1cb0f22eb48.tar.bz2 forums-09e0460e5b53f83f4c06703c8bd8f1cb0f22eb48.tar.xz forums-09e0460e5b53f83f4c06703c8bd8f1cb0f22eb48.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.9] Bumping version number for 3.0.9 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 c2ebff5d21..78dbdd379c 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-RC4" /> + <property name="newversion" value="3.0.9" /> <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, 3.0.9-RC1, 3.0.9-RC2, 3.0.9-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.9-RC1, 3.0.9-RC2, 3.0.9-RC3, 3.0.9-RC4" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |