Merge PR #2746: Remove long-form BSD-license from GKey.cpp/.h.

3rdPartyLicenses/mumble-old-license-headers/LICENSE.txt

@@ -5,13 +5,6 @@ Mumble's AudioConfigDialog
 	Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
 	Copyright (C) 2008, Andreas Messer <andi@bupfen.de>
 
-Support for GKey in Mumble
-
-	src/mumble/GKey.cpp
-	src/mumble/GKey.h
-
-	Copyright (C) 2015, Jordan J Klassen <forivall@gmail.com>
-
 Mumble's PortAudio support
 
 	src/mumble/PAAudio.cpp, src/mumble/PAAudio.h

src/licenses.h

@@ -99,9 +99,11 @@ static const char *authorsMumble =
 	"Antoine Bertin <diaoulael@users.sourceforge.net>\n"
 	"Anton Romanov <theli.ua@gmail.com>\n"
 	"Arie <allochtoon@zonnet.nl>\n"
+	"Arne Fenske <arne_fenske@Yahoo.de>\n"
 	"arrai <array.of.intellect@gmail.com>\n"
 	"Arseniy Lartsev <ars3niy@users.sourceforge.net>\n"
 	"Artem Vorotnikov <skybon@gmail.com>\n"
+	"Arthur Moore <Arthur.Moore.git@cd-net.net>\n"
 	"asmolero <alsamolero@gmail.com>\n"
 	"Asura Lee <ashurta@gmail.com>\n"
 	"B0nuse <mumble@mumble.ru>\n"
@@ -124,6 +126,7 @@ static const char *authorsMumble =
 	"Christopher Knadle <Chris.Knadle@coredump.us>\n"
 	"Cristian Gattamelati <cristian.gattamelati@gmail.com>\n"
 	"d-rez <dark.skeleton@gmail.com>\n"
+	"Davide Beatrici <davidebeatrici@gmail.com>\n"
 	"Davide Beatrici <https://github.com/davidebeatrici>\n"
 	"davidebeatrici <davidebeatrici@gmail.com>\n"
 	"dc6jgk <github.filter@gkware.com>\n"
@@ -160,8 +163,9 @@ static const char *authorsMumble =
 	"Jakob Dettner <jakobdettner@users.sourceforge.net>\n"
 	"James Fraser <fwaggle@fwaggle.org>\n"
 	"Jan Braun <janbraun@gmx.net>\n"
-	"Jan Klass <kissaki@gmx.de>\n"
+	"Jan Klass <kissaki@posteo.de>\n"
 	"javitonino <javitonino@users.sourceforge.net>\n"
+	"Jeff Rogers <jeff@flyzipline.com>\n"
 	"Jérôme \"buggerone\" <buggerone@users.sourceforge.net>\n"
 	"Jerome Vidal <jerhum@users.sourceforge.net>\n"
 	"jgeboski <jgeboski@gmail.com>\n"
@@ -180,14 +184,15 @@ static const char *authorsMumble =
 	"karokatona <karokatona@users.sourceforge.net>\n"
 	"Kevin Rohland <kevin@nascher.org>\n"
 	"Kevin Strasser <kevstras@gmail.com>\n"
-	"Kissaki <kissaki@gmx.de>\n"
 	"Kjetil Jørgensen <kjetijor@users.sourceforge.net>\n"
 	"Kyle Smith <askreet@gmail.com>\n"
+	"Lari Tikkanen <lartza@outlook.com>\n"
 	"Lartza <https://github.com/Lartza>\n"
 	"Lekensteyn <lekensteyn@users.sourceforge.net>\n"
 	"Leszek Godlewski <inequation@users.sourceforge.net>\n"
 	"Ludwig Nussel <ludwig.nussel@suse.de>\n"
 	"Lukas Orsvärn <lucas.orsv@gmail.com>\n"
+	"Luke A Pitt <LukeAPitt@googlemail.com>\n"
 	"main() <main@ehvag.eu.org>\n"
 	"Marc Deslauriers <marc.deslauriers@canonical.com>\n"
 	"Marius Grannæs <grannas@users.sourceforge.net>\n"
@@ -201,6 +206,7 @@ static const char *authorsMumble =
 	"Matt Hamilton <m@tthamilton.com>\n"
 	"Matt Lewandowsky <matt@greenviolet.net>\n"
 	"Matt M. <mokomull@users.sourceforge.net>\n"
+	"Matthias Mailänder <matthias@mailaender.name>\n"
 	"Matthias Salzeder <mail@MatthiasSalzeder.de>\n"
 	"Matthias Vogelgesang <matthias.vogelgesang@gmail.com>\n"
 	"meanracoon <racoon@meanclan.org>\n"
@@ -269,6 +275,7 @@ static const char *authorsMumble =
 	"withgod <withgod@users.sourceforge.net>\n"
 	"x89 <napalm10@gmail.com>\n"
 	"zapman\n"
+	"zeroX-tj <tim.janssens@gmail.com>\n"
 	"Zorg <zorgiepoo@gmail.com>\n"
 	"\n"
 	"// Special thanks to:\n"
@@ -1162,13 +1169,6 @@ static const char *licenseOldStyleLicenseHeaders =
 	"	Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>\n"
 	"	Copyright (C) 2008, Andreas Messer <andi@bupfen.de>\n"
 	"\n"
-	"Support for GKey in Mumble\n"
-	"\n"
-	"	src/mumble/GKey.cpp\n"
-	"	src/mumble/GKey.h\n"
-	"\n"
-	"	Copyright (C) 2015, Jordan J Klassen <forivall@gmail.com>\n"
-	"\n"
 	"Mumble's PortAudio support\n"
 	"\n"
 	"	src/mumble/PAAudio.cpp, src/mumble/PAAudio.h\n"

src/mumble/GKey.cpp

@@ -3,36 +3,6 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-/* Copyright (C) 2015, Jordan J Klassen <forivall@gmail.com>
-
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   - Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
-   - Neither the name of the Mumble Developers nor the names of its
-     contributors may be used to endorse or promote products derived from this
-     software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
 /* SPECIFICATION
  * The code interfacing with the Logitech G-Keys DLL was implemented using the
  * following spec:

src/mumble/GKey.h

@@ -3,36 +3,6 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-/* Copyright (C) 2015, Jordan J Klassen <forivall@gmail.com>
-
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   - Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
-   - Neither the name of the Mumble Developers nor the names of its
-     contributors may be used to endorse or promote products derived from this
-     software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
 #ifndef MUMBLE_MUMBLE_GKEY_H
 #define MUMBLE_MUMBLE_GKEY_H