aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-08-12 10:16:38 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-08-12 10:16:38 +0200
commite47b7540c3def5635bd33614122c70f13588580c (patch)
tree7d5e7754bf28bb921e5762abfc496d649d03c17d /build
parentf76d671dc780f18ca329ef8c21f674cc40336e4a (diff)
parent3be239b8643ec5af0a2e03e88f7d419103fed900 (diff)
downloadforums-e47b7540c3def5635bd33614122c70f13588580c.tar
forums-e47b7540c3def5635bd33614122c70f13588580c.tar.gz
forums-e47b7540c3def5635bd33614122c70f13588580c.tar.bz2
forums-e47b7540c3def5635bd33614122c70f13588580c.tar.xz
forums-e47b7540c3def5635bd33614122c70f13588580c.zip
Merge branch 'prep-release-3.1.0-RC3' into develop-ascraeus
* prep-release-3.1.0-RC3: [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3 [prep-release-3.1.0-RC3] Prepare Changelog [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3
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 ca71aae924..56fe802824 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.1.0-RC3-dev" />
- <property name="prevversion" value="3.1.0-RC2" />
- <property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4, 3.1.0-RC1" />
+ <property name="newversion" value="3.1.0-RC4-dev" />
+ <property name="prevversion" value="3.1.0-RC3" />
+ <property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4, 3.1.0-RC1, 3.1.0-RC2" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />