diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-15 17:32:48 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-15 17:32:48 +0100 |
| commit | 325931a56bcaf23fb8bb3e1e3395ed739714f5d9 (patch) | |
| tree | 9c18bd24951b490de91b55265775599756de0220 /build/build.xml | |
| parent | aee4534d7109c7a7f6337b83b180fbf2176cf0ef (diff) | |
| parent | 9be5405e5bcce7fc3f7e51a6b2912d07ed652b2d (diff) | |
| download | forums-325931a56bcaf23fb8bb3e1e3395ed739714f5d9.tar forums-325931a56bcaf23fb8bb3e1e3395ed739714f5d9.tar.gz forums-325931a56bcaf23fb8bb3e1e3395ed739714f5d9.tar.bz2 forums-325931a56bcaf23fb8bb3e1e3395ed739714f5d9.tar.xz forums-325931a56bcaf23fb8bb3e1e3395ed739714f5d9.zip | |
Merge branch 'prep-release-3.1.0-b1' into develop
* prep-release-3.1.0-b1:
[prep-release-3.1.0-b1] Update build version to 3.1.0-b2-dev
[prep-release-3.1.0-b1] Add changelog for 3.1.0-b1
[prep-release-3.1.0-b1] Prepare Changelog
[prep-release-3.1.0-b1] Add migration for 3.1.0-b1
[prep-release-3.1.0-b1] Update version to 3.1.0-b1
Diffstat (limited to 'build/build.xml')
| -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 1022565ff0..1c6cbe5f25 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-a4-dev" /> - <property name="prevversion" value="3.1.0-a2" /> - <property name="olderversions" value="3.0.12, 3.1.0-a1" /> + <property name="newversion" value="3.1.0-b2-dev" /> + <property name="prevversion" value="3.1.0-b1" /> + <property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |