diff options
| author | Lubos Lunak <l.lunak@suse.cz> | 2011-08-18 14:06:12 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-08-18 14:08:48 +0200 |
| commit | c902dc86556e640532cb857385b75c2bdb60bb2b (patch) | |
| tree | c81766345296572d1b2e17a4e54c43512b9181f2 /TEMPLATE.SOURCECODE.HEADER | |
| parent | b268e6d60681787e0fe7d387259e937c87ce00f5 (diff) | |
Simplified license header template.
With input from Björn Michaelsen and Thorsten Behrens
Diffstat (limited to 'TEMPLATE.SOURCECODE.HEADER')
| -rw-r--r-- | TEMPLATE.SOURCECODE.HEADER | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/TEMPLATE.SOURCECODE.HEADER b/TEMPLATE.SOURCECODE.HEADER index 974b3219b7f0..07fe450eedc7 100644 --- a/TEMPLATE.SOURCECODE.HEADER +++ b/TEMPLATE.SOURCECODE.HEADER @@ -11,14 +11,13 @@ * for the specific language governing rights and limitations under the * License. * - * The Initial Developer of the Original Code is - * [ insert your name / company etc. here eg. Jim Bob <jim@bob.org> ] - * Portions created by the Initial Developer are Copyright (C) 2010 the - * Initial Developer. All Rights Reserved. + * Major Contributor(s): +<<<<<<< + * [ Copyright (C) 2011 Jim Bob <jim@bob.org> (initial developer) ] + * [ Copyright (C) 2011 Ted <ted@bear.com> ] +>>>>>>> * - * Major Contributor(s): - * Ted <ted@bear.com> - * Portions created by the Ted are Copyright (C) 2010 Ted. All Rights Reserved. + * All Rights Reserved. * * For minor contributions see the git repository. * |