diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 17:53:03 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 17:53:03 +0200 |
| commit | 807e000b912a30f3c8010dd7c2acdfa04f6c5392 (patch) | |
| tree | c8297b272e4bfeff5d64ee2bfea9ca6418971ad8 /build | |
| parent | fda2a774b7d5fe2d1f99be76f33b2e4925c20713 (diff) | |
| parent | da48b7df22cbca1cfcbe558851dcc52c096b5edc (diff) | |
| download | forums-807e000b912a30f3c8010dd7c2acdfa04f6c5392.tar forums-807e000b912a30f3c8010dd7c2acdfa04f6c5392.tar.gz forums-807e000b912a30f3c8010dd7c2acdfa04f6c5392.tar.bz2 forums-807e000b912a30f3c8010dd7c2acdfa04f6c5392.tar.xz forums-807e000b912a30f3c8010dd7c2acdfa04f6c5392.zip | |
Merge branch 'prep-release-3.1.0-b4' into develop-ascraeus
* prep-release-3.1.0-b4:
[prep-release-3.1.0-b4] Update phpBB Version for b5 development
[prep-release-3.1.0-b4] Add changelog for 3.1.0-b4
[prep-release-3.1.0-b4] Prepare Changelog
[prep-release-3.1.0-b4] Add migration for 3.1.0-b4
[prep-release-3.1.0-b4] Update version to 3.1.0-b4
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 dbf16acfeb..ec94cf3ea6 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-b4-dev" /> - <property name="prevversion" value="3.1.0-b3" /> - <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" /> + <property name="newversion" value="3.1.0-b5-dev" /> + <property name="prevversion" value="3.1.0-b4" /> + <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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |