From 0d51b117f5e47f6926d19563512545878dd3134d Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Tue, 19 May 2009 21:17:51 +0200 Subject: [PATCH] added BSD license for Mumble icons --- COPYRIGHT | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index f5cd5ea..48bbf56 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -23,7 +23,6 @@ License: Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - =============================================================================== @@ -77,6 +76,7 @@ General Public License for more details. =============================================================================== + The directory "htdocs/yaml" provides the base files needed for YAML, yet another multicolumn layout, on which the layout of Mumble-Django is based. @@ -87,7 +87,7 @@ Upstream Author: Dirk Jesse Copyright: - + License: YAML has been licensed under a Creative Commons Attribution 2.0 License @@ -99,3 +99,45 @@ License: homepage (http://www.yaml.de) in a suitable place (e.g.: footer of the website or in the imprint) is required. + +=============================================================================== + + +The images in the directory "htdocs/mumble" are displayed in the Channel +viewer. They were included in Mumble's source package, which can be obtained +from http://mumble.sf.net. + +Upstream Author: + Martin Skilnand + +Copyright: + + All rights reserved. + +License: + 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. + +