summaryrefslogtreecommitdiff
path: root/tubes
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 /tubes
parentade26b5c7bd2a88be5147feace1969cc01ae3ed4 (diff)
Move to MPLv2 license headers, with ESC decision and author's permission.
Diffstat (limited to 'tubes')
-rw-r--r--tubes/Executable_liboapprover.mk25
-rw-r--r--tubes/source/approver.c27
2 files changed, 8 insertions, 44 deletions
diff --git a/tubes/Executable_liboapprover.mk b/tubes/Executable_liboapprover.mk
index 5d5994a729cf..57d785099180 100644
--- a/tubes/Executable_liboapprover.mk
+++ b/tubes/Executable_liboapprover.mk
@@ -1,28 +1,11 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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/.
#
-# Major Contributor(s):
-# Copyright (C) 2012 Collabora Ltd.
-#
-# All Rights Reserved.
-#
-# 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_Executable_Executable,liboapprover))
diff --git a/tubes/source/approver.c b/tubes/source/approver.c
index f5e58125dc6b..d8d8901e4a26 100644
--- a/tubes/source/approver.c
+++ b/tubes/source/approver.c
@@ -1,29 +1,10 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ * This file is part of the LibreOffice project.
*
- * 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/
- *
- * 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.
- *
- * Major Contributor(s):
- * Copyright (C) 2010-2012 Collabora Ltd.
- *
- * All Rights Reserved.
- *
- * 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.
+ * 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/.
*/
#include <glib.h>