diff options
author | waker <wakeroid@gmail.com> | 2012-07-29 11:47:06 +0200 |
---|---|---|
committer | waker <wakeroid@gmail.com> | 2012-07-29 11:47:06 +0200 |
commit | 123d7135c361d7958c3505e25ed12df302c4999c (patch) | |
tree | 7e1ef06fe60e33f5b02fe09d49f75c306619eb48 | |
parent | 7c3e9c8c43bcfc76b41b5b63b016ca24958a1f30 (diff) |
added ZLIB license text
-rw-r--r-- | AUTHORS | 6 | ||||
-rw-r--r-- | shortlicense.gpl2 (renamed from shortlicense) | 0 | ||||
-rw-r--r-- | shortlicense.zlib | 23 |
3 files changed, 26 insertions, 3 deletions
@@ -1,3 +1,3 @@ -code: Alexey Yakovenko <waker@users.sourceforge.net> -icon: Stas "uncle lag" Akimushkin <uncle.lag@gmail.com> -hotkeys, cdda plugins: Viktor Semykin <thesame.ml@gmail.com> +Alexey Yakovenko <waker@users.sourceforge.net> +Viktor Semykin <thesame.ml@gmail.com> +and many others, please see about.txt diff --git a/shortlicense b/shortlicense.gpl2 index 8d9c6d9f..8d9c6d9f 100644 --- a/shortlicense +++ b/shortlicense.gpl2 diff --git a/shortlicense.zlib b/shortlicense.zlib new file mode 100644 index 00000000..2a5cb512 --- /dev/null +++ b/shortlicense.zlib @@ -0,0 +1,23 @@ +/* + DeaDBeeF -- the music player + Copyright (C) 2009-2012 Alexey Yakovenko and other contributors + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. +*/ + |