diff options
author | Mikkel Krautz <mikkel@krautz.dk> | 2016-05-08 18:23:54 +0300 |
---|---|---|
committer | Mikkel Krautz <mikkel@krautz.dk> | 2016-05-10 23:42:02 +0300 |
commit | 54c28d3ee17c856da2bf30cfcfd0f97c7c4e9164 (patch) | |
tree | 2c921f0ad4a5d88a85d2733ea6a14eefbacfa474 /src/murmur/Tray.cpp | |
parent | 395c084b7a31f4d86101c812f2df631b38a5b3ba (diff) |
src/murmur: update to use LICENSE.header.
Diffstat (limited to 'src/murmur/Tray.cpp')
-rw-r--r-- | src/murmur/Tray.cpp | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/src/murmur/Tray.cpp b/src/murmur/Tray.cpp index bb9ff8019..b450720fe 100644 --- a/src/murmur/Tray.cpp +++ b/src/murmur/Tray.cpp @@ -1,32 +1,7 @@ -/* Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.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. -*/ +// 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>. #include "murmur_pch.h" |