diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-05-31 23:11:27 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-05-31 23:11:27 +0200 |
| commit | 4af503e11bc2c42654cf783f031bdb074fdd91ed (patch) | |
| tree | d2d3c368ce912650ef4e82f5d9f4376ec1a60987 /build | |
| parent | b0eb7768bd3236eed62639be3b74a1736f6872c7 (diff) | |
| parent | 118c5d90daa783ff55319e6121c0fc77166fe58c (diff) | |
| download | forums-4af503e11bc2c42654cf783f031bdb074fdd91ed.tar forums-4af503e11bc2c42654cf783f031bdb074fdd91ed.tar.gz forums-4af503e11bc2c42654cf783f031bdb074fdd91ed.tar.bz2 forums-4af503e11bc2c42654cf783f031bdb074fdd91ed.tar.xz forums-4af503e11bc2c42654cf783f031bdb074fdd91ed.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.
[develop-olympus] Add changelog for 3.0.11 release.
[develop-olympus] Bump version numbers for 3.0.11-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.11 releases.
Conflicts:
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index 1646c10a08..bc65cd0b38 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.0.10" /> - <property name="prevversion" value="3.0.9" /> - <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.10-RC1, 3.0.10-RC2, 3.0.10-RC3" /> + <property name="newversion" value="3.0.11-RC1" /> + <property name="prevversion" value="3.0.10" /> + <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |