[Libreoffice-commits] .: TEMPLATE.SOURCECODE.HEADER

[Thorsten Behrens]

 TEMPLATE.SOURCECODE.HEADER |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit c902dc86556e640532cb857385b75c2bdb60bb2b
Author: Lubos Lunak <l.lunak at suse.cz>
Date:   Thu Aug 18 14:06:12 2011 +0200

    Simplified license header template.
    
    With input from Björn Michaelsen and Thorsten Behrens

diff --git a/TEMPLATE.SOURCECODE.HEADER b/TEMPLATE.SOURCECODE.HEADER
index 974b321..07fe450 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 at 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 at bob.org> (initial developer) ]
+ * [ Copyright (C) 2011 Ted <ted at bear.com> ]
+>>>>>>>
  *
- * Major Contributor(s): 
- * Ted <ted at 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.
  *