diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 01:03:37 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-05 01:03:37 +0200 |
| commit | fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8 (patch) | |
| tree | 72317b8a8c8950959b726834fbb6c5b23b66e51f /build | |
| parent | b9b1e13e70b2fa695f85321682ef2397f2936be4 (diff) | |
| parent | 7ca9c33157ad360750df8bf025a1155e14c6b2bb (diff) | |
| download | forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar.gz forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar.bz2 forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.tar.xz forums-fa253b8b581be9afceb6cdfe8fcb47d175b4fcf8.zip | |
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
[prep-release-3.0.9] Update Changelog for 3.0.9 release.
[prep-release-3.0.9] Bumping version number for the final 3.0.9 release.
[ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.
[ticket/10247] Add a db_tools test for the removal of a primary key column.
[ticket/10247] Add empty data section to database update for RC4
[ticket/10247] Remove unecessary attempt_id primary key column
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
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 ed9643c12f..42642dcefa 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.9-RC3" /> - <property name="prevversion" value="3.0.9-RC2" /> - <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-RC1" /> + <property name="newversion" value="3.0.9" /> + <property name="prevversion" value="3.0.8" /> + <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.9-RC1, 3.0.9-RC2, 3.0.9-RC3" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> |