diff options
author | Mikkel Krautz <mikkel@krautz.dk> | 2016-05-08 18:35:25 +0300 |
---|---|---|
committer | Mikkel Krautz <mikkel@krautz.dk> | 2016-05-10 23:42:03 +0300 |
commit | 3dad85f423bdec058cf47103a2afb077bdc1cf20 (patch) | |
tree | 2968280c755b9093727651c2da3a5d937bfda0cb | |
parent | 76f31680df73a6abe4af2e8e14492c591469d702 (diff) |
overlay_gl: update to use LICENSE.header.
-rw-r--r-- | overlay_gl/avail_mac.h | 5 | ||||
-rw-r--r-- | overlay_gl/init_mac.c | 34 | ||||
-rw-r--r-- | overlay_gl/init_unix.c | 34 | ||||
-rw-r--r-- | overlay_gl/overlay.c | 34 | ||||
-rw-r--r-- | overlay_gl/overlay_gl.pro | 5 |
5 files changed, 22 insertions, 90 deletions
diff --git a/overlay_gl/avail_mac.h b/overlay_gl/avail_mac.h index 4b0ad9929..dfe9d24f7 100644 --- a/overlay_gl/avail_mac.h +++ b/overlay_gl/avail_mac.h @@ -1,3 +1,8 @@ +// Copyright 2005-2016 The Mumble Developers. All rights reserved. +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file at the root of the +// Mumble source tree or at <https://www.mumble.info/LICENSE>. + #ifndef MUMBLE_OVERLAY_AVAIL_MAC_H__ #define MUMBLE_OVERLAY_AVAIL_MAC_H__ diff --git a/overlay_gl/init_mac.c b/overlay_gl/init_mac.c index 8bea0951e..2ffa6a7e0 100644 --- a/overlay_gl/init_mac.c +++ b/overlay_gl/init_mac.c @@ -1,33 +1,7 @@ -/* Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com> - Copyright (C) 2008-2015, Mikkel Krautz <mikkel@krautz.dk> - - 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. -*/ +// Copyright 2005-2016 The Mumble Developers. All rights reserved. +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file at the root of the +// Mumble source tree or at <https://www.mumble.info/LICENSE>. // This file is included by overlay.c for // Mac-specific overlay initialization. diff --git a/overlay_gl/init_unix.c b/overlay_gl/init_unix.c index 985f7b83e..901aa1ecc 100644 --- a/overlay_gl/init_unix.c +++ b/overlay_gl/init_unix.c @@ -1,33 +1,7 @@ -/* Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com> - Copyright (C) 2008-2015, Mikkel Krautz <mikkel@krautz.dk> - - 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. -*/ +// Copyright 2005-2016 The Mumble Developers. All rights reserved. +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file at the root of the +// Mumble source tree or at <https://www.mumble.info/LICENSE>. // This file is included by overlay.c for // Unix/X11/GLX-specific overlay initialization. diff --git a/overlay_gl/overlay.c b/overlay_gl/overlay.c index 736d30ff1..d203ccf9f 100644 --- a/overlay_gl/overlay.c +++ b/overlay_gl/overlay.c @@ -1,33 +1,7 @@ -/* Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com> - Copyright (C) 2008-2015, Mikkel Krautz <mikkel@krautz.dk> - - 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. -*/ +// Copyright 2005-2016 The Mumble Developers. All rights reserved. +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file at the root of the +// Mumble source tree or at <https://www.mumble.info/LICENSE>. #define GLX_GLXEXT_LEGACY #define GL_GLEXT_PROTOTYPES diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro index 3dbabf522..b871774d7 100644 --- a/overlay_gl/overlay_gl.pro +++ b/overlay_gl/overlay_gl.pro @@ -1,3 +1,8 @@ +# Copyright 2005-2016 The Mumble Developers. All rights reserved. +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file at the root of the +# Mumble source tree or at <https://www.mumble.info/LICENSE>. + # Overlay payload for Unix-like systems and OS X. include(../compiler.pri) |