diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-04 20:25:11 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-04 20:25:11 +0200 |
| commit | 6cca7d0443a833c3e6b11c30bdfadc5f6d78c7f1 (patch) | |
| tree | d70c693ed6641a841f74211baf326abd86ed131a /build | |
| parent | 5b6bce89c9866142bb489b6bd6bbf6362c4b9a7a (diff) | |
| parent | a469974c85fa04b3f0bc85bd99701920e83b016e (diff) | |
| download | forums-6cca7d0443a833c3e6b11c30bdfadc5f6d78c7f1.tar forums-6cca7d0443a833c3e6b11c30bdfadc5f6d78c7f1.tar.gz forums-6cca7d0443a833c3e6b11c30bdfadc5f6d78c7f1.tar.bz2 forums-6cca7d0443a833c3e6b11c30bdfadc5f6d78c7f1.tar.xz forums-6cca7d0443a833c3e6b11c30bdfadc5f6d78c7f1.zip | |
Merge branch 'prep-release-3.1.0-b3' into develop-ascraeus
* prep-release-3.1.0-b3:
[prep-release-3.1.0-b3] Update phpBB Version for b4 development
[prep-release-3.1.0-b3] Add changelog for 3.1.0-b3
[prep-release-3.1.0-b3] Prepare Changelog
[prep-release-3.1.0-b3] Add migration for 3.1.0-b3
[prep-release-3.1.0-b3] Update version to 3.1.0-b3
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 c1f81fb947..01fb48a383 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-b3-dev" /> - <property name="prevversion" value="3.1.0-b2" /> - <property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1" /> + <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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |