diff options
author | Michael Meeks <michael.meeks@suse.com> | 2013-04-24 17:14:03 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-04-30 13:34:06 +0100 |
commit | 72e5d0c8fbedb509fccec7aa8bd03f89cda9ef6d (patch) | |
tree | 24f9bc11331c1143d03abcd5bb1aacd5adb835f5 /vcl | |
parent | ade26b5c7bd2a88be5147feace1969cc01ae3ed4 (diff) |
Move to MPLv2 license headers, with ESC decision and author's permission.
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/Executable_kdefilepicker.mk | 25 | ||||
-rw-r--r-- | vcl/Executable_tdefilepicker.mk | 26 | ||||
-rw-r--r-- | vcl/StaticLibrary_headless.mk | 34 | ||||
-rw-r--r-- | vcl/headless/svpdata.cxx | 28 | ||||
-rw-r--r-- | vcl/source/control/thumbpos.hxx | 2 |
5 files changed, 21 insertions, 94 deletions
diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk index 40a95922917d..4b41b295cf23 100644 --- a/vcl/Executable_kdefilepicker.mk +++ b/vcl/Executable_kdefilepicker.mk @@ -1,29 +1,12 @@ # -*- Mode: makefile; 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) 2011 Matúš Kukan <matus.kukan@gmail.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. $(eval $(call gb_Executable_Executable,kdefilepicker)) diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk index 10af256719ba..3a2c539f4d8c 100644 --- a/vcl/Executable_tdefilepicker.mk +++ b/vcl/Executable_tdefilepicker.mk @@ -1,30 +1,12 @@ # -*- Mode: makefile; 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) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer) -# Copyright (C) 2012 Timothy Pearson (TDE) -# -# 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,tdefilepicker)) diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index 43dfac8efbaa..6d179b68cab7 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -1,30 +1,10 @@ -## -## 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/ -## -## 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 file is part of the LibreOffice project. +# +# 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/. +# $(eval $(call gb_StaticLibrary_StaticLibrary,headless)) diff --git a/vcl/headless/svpdata.cxx b/vcl/headless/svpdata.cxx index 32afd02197df..ede1c1b5a94e 100644 --- a/vcl/headless/svpdata.cxx +++ b/vcl/headless/svpdata.cxx @@ -1,30 +1,12 @@ /* -*- 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 Novell, Inc. - * - * 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 <generic/gendata.hxx> #include <headless/svpinst.hxx> diff --git a/vcl/source/control/thumbpos.hxx b/vcl/source/control/thumbpos.hxx index 1937125e6fff..4077da84359b 100644 --- a/vcl/source/control/thumbpos.hxx +++ b/vcl/source/control/thumbpos.hxx @@ -1,6 +1,6 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright 2012 LibreOffice contributors. + * This file is part of the LibreOffice project. * * 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 |