summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-04-24 17:14:03 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-04-30 13:34:06 +0100
commit72e5d0c8fbedb509fccec7aa8bd03f89cda9ef6d (patch)
tree24f9bc11331c1143d03abcd5bb1aacd5adb835f5 /xmerge
parentade26b5c7bd2a88be5147feace1969cc01ae3ed4 (diff)
Move to MPLv2 license headers, with ESC decision and author's permission.
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/Jar_XMergeBridge.mk27
-rw-r--r--xmerge/Jar_xmerge.mk27
-rw-r--r--xmerge/Module_xmerge.mk27
3 files changed, 12 insertions, 69 deletions
diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk
index 2b0270667ce7..c07d84b56dcb 100644
--- a/xmerge/Jar_XMergeBridge.mk
+++ b/xmerge/Jar_XMergeBridge.mk
@@ -1,30 +1,11 @@
#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-# The Initial Developer of the Original Code is
-# Peter Foley <pefoley2@verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
#
$(eval $(call gb_Jar_Jar,XMergeBridge))
diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk
index 03256d86768d..8d0e7ff96791 100644
--- a/xmerge/Jar_xmerge.mk
+++ b/xmerge/Jar_xmerge.mk
@@ -1,30 +1,11 @@
#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-# The Initial Developer of the Original Code is
-# Peter Foley <pefoley2@verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
#
$(eval $(call gb_Jar_Jar,xmerge))
diff --git a/xmerge/Module_xmerge.mk b/xmerge/Module_xmerge.mk
index 695d21d1b1e9..380df59d31f0 100644
--- a/xmerge/Module_xmerge.mk
+++ b/xmerge/Module_xmerge.mk
@@ -1,30 +1,11 @@
#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
+# This file is part of the LibreOffice project.
#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-# The Initial Developer of the Original Code is
-# Peter Foley <pefoley2@verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
#
$(eval $(call gb_Module_Module,xmerge))