diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-31 12:09:53 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-31 12:11:43 +0100 |
| commit | 3c23242bfe8666cfa7fb3ae6b55c2190f397c773 (patch) | |
| tree | 6c345f16d9947668bdc440ef34db7e1cddd132af /build | |
| parent | 67478a0f94611ba642e31549b52d83f04a4c8028 (diff) | |
| parent | be30d8251a5c0a9ffb59f415cba7e10bbe714f68 (diff) | |
| download | forums-3c23242bfe8666cfa7fb3ae6b55c2190f397c773.tar forums-3c23242bfe8666cfa7fb3ae6b55c2190f397c773.tar.gz forums-3c23242bfe8666cfa7fb3ae6b55c2190f397c773.tar.bz2 forums-3c23242bfe8666cfa7fb3ae6b55c2190f397c773.tar.xz forums-3c23242bfe8666cfa7fb3ae6b55c2190f397c773.zip | |
Merge branch 'prep-release-3.1.3' 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 a8d34d3db1..2bbd80ca92 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.3-RC1" /> - <property name="prevversion" value="3.1.2" /> - <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 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, 3.1.0-RC6, 3.1.0, 3.1.1, 3.1.2-RC1" /> + <property name="newversion" value="3.1.4-dev" /> + <property name="prevversion" value="3.1.3-RC2" /> + <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.1.0, 3.1.1, 3.1.2" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |