diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-01-01 16:09:53 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-01-01 16:09:53 +0100 |
| commit | 44a236991c71acfbeac9f6a25427dc922262d02b (patch) | |
| tree | d08fc6d5cfdb44552f3f347cc4485398d4393e1e | |
| parent | 96114f7e3575683143bca733bb2c527408005348 (diff) | |
| parent | 3f91405acb5e5fcc026aa6e9fe1046d8f95144cc (diff) | |
| download | forums-44a236991c71acfbeac9f6a25427dc922262d02b.tar forums-44a236991c71acfbeac9f6a25427dc922262d02b.tar.gz forums-44a236991c71acfbeac9f6a25427dc922262d02b.tar.bz2 forums-44a236991c71acfbeac9f6a25427dc922262d02b.tar.xz forums-44a236991c71acfbeac9f6a25427dc922262d02b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.10] Bumping version number for 3.0.10 final.
Conflicts:
phpBB/install/database_update.php
| -rw-r--r-- | build/build.xml | 4 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index bf4c97297b..3d8d3de640 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-RC3" /> + <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" /> + <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" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 2b5ce4bf31..da48e4d3a5 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1062,6 +1062,8 @@ function database_update_info() '3.0.10-RC1' => array(), // No changes from 3.0.10-RC2 to 3.0.10-RC3 '3.0.10-RC2' => array(), + // No changes from 3.0.10-RC3 to 3.0.10 + '3.0.10-RC3' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */ @@ -2137,6 +2139,10 @@ function change_database_data(&$no_updates, $version) case '3.0.10-RC2': break; + // No changes from 3.0.10-RC3 to 3.0.10 + case '3.0.10-RC3': + break; + // Changes from 3.1.0-dev to 3.1.0-A1 case '3.1.0-dev': |