aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-06 03:33:16 +0100
committerNils Adermann <naderman@naderman.de>2010-03-06 03:33:16 +0100
commit797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6 (patch)
treeec0e46b4091f89f405d11473f84b616450b5f966 /build
parent693a2dc99bf07aeac1865d4a48ddf2589317ac7a (diff)
parent568fb83373361abb8c9f3886fee944a8d9e5f66d (diff)
downloadforums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.tar
forums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.tar.gz
forums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.tar.bz2
forums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.tar.xz
forums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.zip
Merge branch 'develop-olympus' into develop
Diffstat (limited to 'build')
-rwxr-xr-xbuild/build_diff.php4
-rwxr-xr-xbuild/package.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/build/build_diff.php b/build/build_diff.php
index c8a40f4f5e..ef815bc0c3 100755
--- a/build/build_diff.php
+++ b/build/build_diff.php
@@ -11,9 +11,9 @@
// CONFIG - Begin
$substitute_old = '3.0.6';
-$substitute_new = '3.0.7';
+$substitute_new = '3.0.7-PL1';
$simple_name_old = 'phpbb306';
-$simple_name_new = 'phpbb307';
+$simple_name_new = 'phpbb307-PL1';
$echo_changes = false;
// Set this to true to just compress the changes and do not build them again
// This should be used for building custom modified txt file. ;)
diff --git a/build/package.php b/build/package.php
index e04750d4be..7cb30bd493 100755
--- a/build/package.php
+++ b/build/package.php
@@ -15,7 +15,7 @@
// If RC8 drops remove the install/data directory
//$versions = array('3.0.2', '3.0.3-RC1', '3.0.3', '3.0.4-RC1', '3.0.4', '3.0.5-RC1', '3.0.5', '3.0.6-RC1', '3.0.6-RC2', '3.0.6-RC3');
//$versions = array('3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6', '3.0.7-RC1', '3.0.7');
-$versions = array('3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6', '3.0.7-RC1', '3.0.7-RC2', '3.0.7');
+$versions = array('3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6', '3.0.7-RC1', '3.0.7-RC2', '3.0.7', '3.0.7-PL1');
$verbose = false;
require('build_helper.php');