aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-07-11 21:18:42 +0200
committerMarc Alexander <admin@m-a-styles.de>2017-07-11 21:18:42 +0200
commit05c47a0f4abcc068e2dbba095cf2b9482022fa82 (patch)
treec5161f2fc478016e55689e4ff67a0438a837b2b5 /build
parentMerge branch '3.1.x' into 3.2.x (diff)
parent[3.1.x] Update version number to 3.1.12-dev (diff)
downloadphpbb-05c47a0f4abcc068e2dbba095cf2b9482022fa82.tar.gz
phpbb-05c47a0f4abcc068e2dbba095cf2b9482022fa82.tar.bz2
phpbb-05c47a0f4abcc068e2dbba095cf2b9482022fa82.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'build')
-rw-r--r--build/build.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml
index dd5fa4c5d8..c2e2aea1d8 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -4,7 +4,7 @@
<!-- a few settings for the build -->
<property name="newversion" value="3.2.1-dev" />
<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" />
+ <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-RC1, 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}" />