diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-02-05 22:25:45 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-02-05 22:25:45 +0100 |
| commit | 344baf91809bbfd5a224191e13472b94f77b421c (patch) | |
| tree | 3beda4c0c83da67a6593928d1c7c88cfe8f0317a /build | |
| parent | 32bc5d72e424881109e0c86b716e8bd77e41bffc (diff) | |
| parent | bf93e20afb7a047dbdc848e808feac5788752ff7 (diff) | |
| download | forums-344baf91809bbfd5a224191e13472b94f77b421c.tar forums-344baf91809bbfd5a224191e13472b94f77b421c.tar.gz forums-344baf91809bbfd5a224191e13472b94f77b421c.tar.bz2 forums-344baf91809bbfd5a224191e13472b94f77b421c.tar.xz forums-344baf91809bbfd5a224191e13472b94f77b421c.zip | |
Merge branch 'prep-release-3.1.0-a3' into develop
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 c65c71d2dc..1022565ff0 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-a2" /> - <property name="prevversion" value="3.1.0-a1" /> - <property name="olderversions" value="3.0.12" /> + <property name="newversion" value="3.1.0-a4-dev" /> + <property name="prevversion" value="3.1.0-a2" /> + <property name="olderversions" value="3.0.12, 3.1.0-a1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |