diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-01-21 16:03:23 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-01-21 16:07:12 +0100 |
| commit | 7ed065a630abab7ca1978e23eaa393130ed2c550 (patch) | |
| tree | 3d636fb02a8b0f7afca4081e8a88e2eb25a16686 /build | |
| parent | ddeb696b25da56eba61f777f4e3c9a4706089a8c (diff) | |
| parent | 14585fcb4f1d6238a188089891a11895a557f99e (diff) | |
| download | forums-7ed065a630abab7ca1978e23eaa393130ed2c550.tar forums-7ed065a630abab7ca1978e23eaa393130ed2c550.tar.gz forums-7ed065a630abab7ca1978e23eaa393130ed2c550.tar.bz2 forums-7ed065a630abab7ca1978e23eaa393130ed2c550.tar.xz forums-7ed065a630abab7ca1978e23eaa393130ed2c550.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[develop-olympus] Increment version number to 3.0.14-dev.
[develop-olympus] Add changelog for 3.0.13 release.
[develop-olympus] Bump version numbers for 3.0.13-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.13 releases.
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index dd7bb3d014..4d16ad1b6a 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ <!-- a few settings for the build --> <property name="newversion" value="3.1.3-RC1-dev" /> <property name="prevversion" value="3.1.2" /> - <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, 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="olderversions" value="3.0.12, 3.0.13-RC1, 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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |