diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-07 20:29:25 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-07 20:29:25 +0200 |
| commit | 9c6c5895bcb6c5d16c7014ae444d817795e20039 (patch) | |
| tree | a1e0ee50e41e8d4cc09d58f0a70a5e8419aeccf5 | |
| parent | 79af1da0a5f7ec4f7cca43913e5e42dddabd3251 (diff) | |
| parent | f2110183e0a362d4dc72019b97dc165c6fa858bd (diff) | |
| download | forums-9c6c5895bcb6c5d16c7014ae444d817795e20039.tar forums-9c6c5895bcb6c5d16c7014ae444d817795e20039.tar.gz forums-9c6c5895bcb6c5d16c7014ae444d817795e20039.tar.bz2 forums-9c6c5895bcb6c5d16c7014ae444d817795e20039.tar.xz forums-9c6c5895bcb6c5d16c7014ae444d817795e20039.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release.
[prep-release-3.0.9] Decreasing version for an RC4 release.
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index 42642dcefa..c2ebff5d21 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> - <property name="newversion" value="3.0.9" /> + <property name="newversion" value="3.0.9-RC4" /> <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 --> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c0ec93cafb..6437fef1d5 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -335,6 +335,8 @@ </li> <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10247'>PHPBB3-10247</a>] - mediumint(8) too small for phpbb_login_attempts.attempt_id </li> +<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10250'>PHPBB3-10250</a>] - phpBB Logo needs the Registered Trademark Symbol +</li> </ul> <h4> Improvement diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 312629ca77..56e475b3ce 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1046,7 +1046,7 @@ function database_update_info() '3.0.9-RC1' => array(), // No changes from 3.0.9-RC2 to 3.0.9-RC3 '3.0.9-RC2' => array(), - // No changes from 3.0.9-RC3 to 3.0.9 + // No changes from 3.0.9-RC3 to 3.0.9-RC4 '3.0.9-RC3' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */ @@ -2067,7 +2067,7 @@ function change_database_data(&$no_updates, $version) case '3.0.9-RC2': break; - // No changes from 3.0.9-RC3 to 3.0.9 + // No changes from 3.0.9-RC3 to 3.0.9-RC4 case '3.0.9-RC3': break; |