diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-01-02 19:10:47 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-01-02 19:10:47 +0100 |
| commit | 6b8d5058c069b4c6198d844cd31db51c591e0c3a (patch) | |
| tree | 06484db25b0e9f8f44fa6e561bc8f8de26bf928f /phpBB/develop | |
| parent | 69a725198b7abd54b985773d1049f4848a8de14c (diff) | |
| parent | 66c50f6b30400b729d3fea4fb06dad5eb559aa51 (diff) | |
| download | forums-6b8d5058c069b4c6198d844cd31db51c591e0c3a.tar forums-6b8d5058c069b4c6198d844cd31db51c591e0c3a.tar.gz forums-6b8d5058c069b4c6198d844cd31db51c591e0c3a.tar.bz2 forums-6b8d5058c069b4c6198d844cd31db51c591e0c3a.tar.xz forums-6b8d5058c069b4c6198d844cd31db51c591e0c3a.zip | |
Merge branch 'ticket/unknownbliss/9916' into develop
* ticket/unknownbliss/9916:
[ticket/9916] Updating license in non-distributed files
[ticket/9916] Updating header license and removing Version $Id$
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/lang_duplicates.php | 4 | ||||
| -rwxr-xr-x | phpBB/develop/remove-php-end-tags.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/develop/lang_duplicates.php b/phpBB/develop/lang_duplicates.php index 3ea841b6d6..02852798b6 100644 --- a/phpBB/develop/lang_duplicates.php +++ b/phpBB/develop/lang_duplicates.php @@ -15,10 +15,8 @@ die("Please read the first lines of this script for instructions on how to enabl // ------------------------------------------------------------- // -// $Id$ -// // @copyright (c) 2005 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 // // ------------------------------------------------------------- // Thanks to arod-1 diff --git a/phpBB/develop/remove-php-end-tags.py b/phpBB/develop/remove-php-end-tags.py index 1707c6d519..89b9ee5032 100755 --- a/phpBB/develop/remove-php-end-tags.py +++ b/phpBB/develop/remove-php-end-tags.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # Remove ending PHP tags '?>' # @author Oleg Pudeyev -# @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 import sys, os, os.path, optparse |