From 509b080847323905c2bfac3c3e0732fb38755847 Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Wed, 27 Aug 2014 22:52:45 +0200
Subject: replace unlicensed icons/images, add proper credits   * fugue icons
 (http://p.yusukekamiyamane.com/) CC-BY-SA license   * ornimental bookend
 (https://openclipart.org/detail/19869/ornimental-bookend---left-by-j4p4n)
 Public domain license   * Paper_texture_v5_by_bashcorpo_w1000.jpg source
 found at
 http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998 under
 Public Domain license   * linecons
 (https://www.iconfinder.com/iconsets/linecons-free-vector-icons-pack) CC-BY
 license   * add credits to COPYING, (get list of committers with git shortlog
 -sne, and previous contributors from the author's website)   * Fixes
 https://github.com/shaarli/Shaarli/issues/10   * Fixes
 https://github.com/sebsauvage/Shaarli/issues/8

---
 COPYING | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 3 deletions(-)

(limited to 'COPYING')

diff --git a/COPYING b/COPYING
index d9731d27..0ba11e48 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,50 @@
-Shaarli is distributed under the zlib/libpng License:
+Files: * 
+License: zlib/libpng
+Copyright: (c) 2011-2014 SĂ©bastien SAUVAGE <sebsauvage@sebsauvage.net>
+           (c) 2011-2014 Alexandre Alapetite <alexandre@alapetite.fr>
+           (c) 2011-2014 David Sferruzza <david.sferruzza@gmail.com>
+           (c) 2011-2014 Christophe HENRY <christophe.henry@sbgodin.fr>
+           (c) 2011-2014 Mathieu Chabanon <git@matchab.fr>
+           (c) 2011-2014 BoboTiG <bobotig@gmail.com>
+           (c) 2011-2014 Bronco <bronco@warriordudimanche.net>
+           (c) 2011-2014 Emilien Klein <emilien@klein.st>
+           (c) 2011-2014 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org>
+           (c) 2011-2014 Lionel Martin <renarddesmers@gmail.com>
+           (c) 2011-2014 lehollandaisvolant <levoltigeurhollandais@gmail.com>
+           (c) 2011-2014 timo van neerden <fire@lehollandaisvolant.net>
+           (c) 2011-2014 nodiscc <nodiscc@gmail.com>
+
+
+
+Files: images/calendar.png, images/edit_icon.png, images/feed-icon-14x14.png, images/private.png, images/private_16x16.png, images/private_16x16_active.png, images/qrcode.png, images/tag_blue.png
+License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
+Copyright: (c) 2014 Yusuke Kamiyamane
+Source: http://p.yusukekamiyamane.com/
+
+Files: images/delete_icon.png
+License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
+Copyright: (c) 2014 Designmodo
+Source: http://designmodo.com/linecons-free/
+
+
+Files: images/floral_left.png, images/floral_right.png, images/squiggle.png, images/squiggle2.png, images/squiggle_closing.png
+Licence: Public Domain
+Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg
+
+
+Files: images/Paper_texture_v5_by_bashcorpo_w1000.jpg
+Licence: Public Domain
+Source: http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998
+
+Files: images/logo.png
+License: zlib/libpng
+Copyright: (c) 2011-2014 idleman idleman@idleman.fr
+
+
+
+--------------------------------------------------------
+ZLIB/LIBPNG LICENSE
 
-Copyright (c) 2011 Sébastien SAUVAGE (sebsauvage.net)
 
 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
@@ -18,4 +62,4 @@ freely, subject to the following restrictions:
   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.
+  3. This notice may not be removed or altered from any source distribution.
\ No newline at end of file
-- 
cgit v1.2.3