aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-01-07 17:08:30 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-01-07 17:08:30 +0100
commit8d58d1814fc0ba9050d83430704cb18ca9730577 (patch)
tree66d4282b32e193f330451c221b0ebf7c7661d318 /build
parentMerge branch '3.2.x' (diff)
parentMerge branch 'prep-release-3.2.0' into 3.2.x (diff)
downloadphpbb-8d58d1814fc0ba9050d83430704cb18ca9730577.tar.gz
phpbb-8d58d1814fc0ba9050d83430704cb18ca9730577.tar.bz2
phpbb-8d58d1814fc0ba9050d83430704cb18ca9730577.zip
Merge branch '3.2.x'
Diffstat (limited to 'build')
-rw-r--r--build/build.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml
index c2544ba566..f93ff0079b 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.3.0-a1-dev" />
- <property name="prevversion" value="3.2.0-RC2" />
- <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1" />
+ <property name="prevversion" value="3.2.0" />
+ <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />