aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-01-02 17:35:49 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-01-02 17:35:49 +0100
commitfd55d64996637084096ec83f84c5f007959c9fcd (patch)
tree52e81c2dee04edc33ce77a15c9f7f612e0bc55e7 /build
parent3f91405acb5e5fcc026aa6e9fe1046d8f95144cc (diff)
parent5e52734c240e5ecfb812202cd4cae305be9290c5 (diff)
downloadforums-fd55d64996637084096ec83f84c5f007959c9fcd.tar
forums-fd55d64996637084096ec83f84c5f007959c9fcd.tar.gz
forums-fd55d64996637084096ec83f84c5f007959c9fcd.tar.bz2
forums-fd55d64996637084096ec83f84c5f007959c9fcd.tar.xz
forums-fd55d64996637084096ec83f84c5f007959c9fcd.zip
Merge remote-tracking branch 'unknownbliss/ticket/9916-olympus' into develop-olympus
* unknownbliss/ticket/9916-olympus: [ticket/9916] Changing header in non-distributed files [ticket/9916] Changing coding guidelines license [ticket/9916] Updating License in the header
Diffstat (limited to 'build')
-rwxr-xr-xbuild/build_changelog.php2
-rwxr-xr-xbuild/build_diff.php5
-rw-r--r--build/build_helper.php3
-rw-r--r--build/diff_class.php3
-rwxr-xr-xbuild/package.php3
5 files changed, 6 insertions, 10 deletions
diff --git a/build/build_changelog.php b/build/build_changelog.php
index 4eb5ebd83b..1e80959adf 100755
--- a/build/build_changelog.php
+++ b/build/build_changelog.php
@@ -4,7 +4,7 @@
*
* @package build
* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU General Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
diff --git a/build/build_diff.php b/build/build_diff.php
index 6a6070228f..0824b53caa 100755
--- a/build/build_diff.php
+++ b/build/build_diff.php
@@ -3,9 +3,8 @@
/**
*
* @package build
-* @version $Id$
* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
@@ -388,7 +387,7 @@ function build_header($mode, $filenames, $header)
$html .= "## {$filename['phpbb_filename']}\n";
}
}
- $html .= "## License: http://opensource.org/licenses/gpl-license.php GNU General Public License v2 \n";
+ $html .= "## License: http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 \n";
$html .= "############################################################## \n";
$html .= "\n";
diff --git a/build/build_helper.php b/build/build_helper.php
index 2d9b86b3c3..d6169b913b 100644
--- a/build/build_helper.php
+++ b/build/build_helper.php
@@ -2,9 +2,8 @@
/**
*
* @package build
-* @version $Id$
* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
diff --git a/build/diff_class.php b/build/diff_class.php
index 4625ffde24..2d8555400d 100644
--- a/build/diff_class.php
+++ b/build/diff_class.php
@@ -2,10 +2,9 @@
/**
*
* @package build
-* @version $Id$
* @copyright (c) 2000 Geoffrey T. Dairiki <dairiki@dairiki.org>
* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
diff --git a/build/package.php b/build/package.php
index 4ce644e8ca..48f42b3572 100755
--- a/build/package.php
+++ b/build/package.php
@@ -3,9 +3,8 @@
/**
*
* @package build
-* @version $Id$
* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/