From 123d7135c361d7958c3505e25ed12df302c4999c Mon Sep 17 00:00:00 2001 From: waker Date: Sun, 29 Jul 2012 11:47:06 +0200 Subject: added ZLIB license text --- AUTHORS | 6 +++--- shortlicense | 18 ------------------ shortlicense.gpl2 | 18 ++++++++++++++++++ shortlicense.zlib | 23 +++++++++++++++++++++++ 4 files changed, 44 insertions(+), 21 deletions(-) delete mode 100644 shortlicense create mode 100644 shortlicense.gpl2 create mode 100644 shortlicense.zlib diff --git a/AUTHORS b/AUTHORS index 0aac4c41..9d7104fb 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,3 @@ -code: Alexey Yakovenko -icon: Stas "uncle lag" Akimushkin -hotkeys, cdda plugins: Viktor Semykin +Alexey Yakovenko +Viktor Semykin +and many others, please see about.txt diff --git a/shortlicense b/shortlicense deleted file mode 100644 index 8d9c6d9f..00000000 --- a/shortlicense +++ /dev/null @@ -1,18 +0,0 @@ -/* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2012 Alexey Yakovenko - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ diff --git a/shortlicense.gpl2 b/shortlicense.gpl2 new file mode 100644 index 00000000..8d9c6d9f --- /dev/null +++ b/shortlicense.gpl2 @@ -0,0 +1,18 @@ +/* + DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + Copyright (C) 2009-2012 Alexey Yakovenko + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ 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. +*/ + -- cgit v1.2.3