diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-23 02:44:45 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-23 02:44:45 +0200 |
| commit | 08f365236acb48f9017b6e978a9b9c50ab5ed960 (patch) | |
| tree | f35e7ec45473df00f91b8b85e262704c30f1683d /build | |
| parent | e4c8e4905c327b73252667f09500b3248c55e86c (diff) | |
| parent | 7a90184421a5c70f657a7497abade036054ee5dd (diff) | |
| download | forums-08f365236acb48f9017b6e978a9b9c50ab5ed960.tar forums-08f365236acb48f9017b6e978a9b9c50ab5ed960.tar.gz forums-08f365236acb48f9017b6e978a9b9c50ab5ed960.tar.bz2 forums-08f365236acb48f9017b6e978a9b9c50ab5ed960.tar.xz forums-08f365236acb48f9017b6e978a9b9c50ab5ed960.zip | |
Merge branch 'prep-release-3.1.0-RC6' into develop-ascraeus
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index de0f916a1f..3797ab6bf0 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-RC6-dev" /> - <property name="prevversion" value="3.1.0-RC5" /> - <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, 3.1.0-RC3, 3.1.0-RC4" /> + <property name="newversion" value="3.1.0-RC7-dev" /> + <property name="prevversion" value="3.1.0-RC6" /> + <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, 3.1.0-RC3, 3.1.0-RC4, 3.1.0-RC5" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |