aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-04-28 21:42:39 +0200
committerAndreas Fischer <bantu@phpbb.com>2015-04-28 21:42:39 +0200
commit62abead26d52d02cf7de1e9e639e0c1ace40ba91 (patch)
tree5e056e8cfc7e6519b2f99dddb264a0717889b6aa /build
parent0bc352ea7e15c2a9b2cf4b71cf0653d49cd6ac42 (diff)
parent969718fc91cc2343332d0b89d9e842a8a1c2c1d3 (diff)
downloadforums-62abead26d52d02cf7de1e9e639e0c1ace40ba91.tar
forums-62abead26d52d02cf7de1e9e639e0c1ace40ba91.tar.gz
forums-62abead26d52d02cf7de1e9e639e0c1ace40ba91.tar.bz2
forums-62abead26d52d02cf7de1e9e639e0c1ace40ba91.tar.xz
forums-62abead26d52d02cf7de1e9e639e0c1ace40ba91.zip
Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases.
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 d4b1bdffaa..823f57206d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -4,7 +4,7 @@
<!-- a few settings for the build -->
<property name="newversion" value="3.1.5-dev" />
<property name="prevversion" value="3.1.3" />
- <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.1.0, 3.1.1, 3.1.2" />
+ <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14-RC1, 3.1.0, 3.1.1, 3.1.2" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />