diff options
author | Michael Meeks <michael.meeks@suse.com> | 2013-04-19 21:10:42 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-04-22 09:37:38 +0100 |
commit | 62badf38283ef31e50d40e62f5d8bc3824c615d7 (patch) | |
tree | 881bc256a4e32fb44e6234bda90e96ba8617a39a /salhelper | |
parent | 479593b187dbdc48168f4353880243a880c0b5b6 (diff) |
Move to MPLv2 license headers, with ESC decision and author's permission.
Diffstat (limited to 'salhelper')
-rw-r--r-- | salhelper/inc/salhelper/linkhelper.hxx | 28 | ||||
-rw-r--r-- | salhelper/inc/salhelper/thread.hxx | 28 | ||||
-rw-r--r-- | salhelper/source/thread.cxx | 28 |
3 files changed, 12 insertions, 72 deletions
diff --git a/salhelper/inc/salhelper/linkhelper.hxx b/salhelper/inc/salhelper/linkhelper.hxx index 137ea06a5f1a..ef185c078908 100644 --- a/salhelper/inc/salhelper/linkhelper.hxx +++ b/salhelper/inc/salhelper/linkhelper.hxx @@ -1,30 +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) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com> - * (initial developer) - * - * 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/. */ #ifndef _SALHELPER_LINKHELPER_HXX diff --git a/salhelper/inc/salhelper/thread.hxx b/salhelper/inc/salhelper/thread.hxx index 2b657b3ab6e3..b160b2d1eb6a 100644 --- a/salhelper/inc/salhelper/thread.hxx +++ b/salhelper/inc/salhelper/thread.hxx @@ -1,30 +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) 2012 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> - * (initial developer) ] - * - * 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/. */ #ifndef INCLUDED_SALHELPER_THREAD_HXX diff --git a/salhelper/source/thread.cxx b/salhelper/source/thread.cxx index aaad063376f2..52c028c133ba 100644 --- a/salhelper/source/thread.cxx +++ b/salhelper/source/thread.cxx @@ -1,30 +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) 2012 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> - * (initial developer) ] - * - * 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 "sal/config.h" |