aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-01-07 18:43:45 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-01-07 18:43:45 +0100
commit7e2136587a4d5f2f011189aca6f94ee6a780eaf1 (patch)
tree763217246e4df1f69d6612c0ed1397bc05fbec74 /build
parent182a96f2738316adcb292816a9ac8af0e0cb5866 (diff)
parent77b275181aeddf43e1077d06abce11a9722bb85a (diff)
downloadforums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.tar
forums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.tar.gz
forums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.tar.bz2
forums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.tar.xz
forums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.zip
Merge branch 'prep-release-3.2.2' into 3.2.x
Diffstat (limited to 'build')
-rw-r--r--build/build.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml
index e748aabdb7..2ef9016a17 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.2.3-dev" />
- <property name="prevversion" value="3.2.2-RC1" />
- <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.1.11, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0, 3.2.1" />
+ <property name="newversion" value="3.2.2" />
+ <property name="prevversion" value="3.2.1" />
+ <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.1.11, 3.1.12, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0, 3.2.2-RC1" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />