aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-10-23 20:56:58 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-10-23 20:56:58 +0200
commit90a8e1dd1c8714f1e7da658a7401e782f6313fe4 (patch)
tree6608300abee27c730ce74dfa072572fdc2835765 /build
parentMerge branch '3.2.x' into 3.3.x (diff)
parent[prep-release-3.3.0-b1] Add jquery update migration to 330b1 dependencies (diff)
downloadphpbb-90a8e1dd1c8714f1e7da658a7401e782f6313fe4.tar.gz
phpbb-90a8e1dd1c8714f1e7da658a7401e782f6313fe4.tar.bz2
phpbb-90a8e1dd1c8714f1e7da658a7401e782f6313fe4.zip
Merge branch 'prep-release-3.3.0-b1' into 3.3.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 5748260679..f8490315ac 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.3.0-b1-dev" />
- <property name="prevversion" value="3.2.7" />
- <property name="olderversions" value="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.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.8-RC1" />
+ <property name="newversion" value="3.3.0-b1" />
+ <property name="prevversion" value="3.2.8" />
+ <property name="olderversions" value="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.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />