aboutsummaryrefslogtreecommitdiffhomepage
path: root/COPYING
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2014-08-30 21:12:29 +0200
committernodiscc <nodiscc@gmail.com>2014-08-30 21:12:29 +0200
commit50df2cde744d514eb4cda9af305bf005f9879930 (patch)
tree7bfc54dd4bbaf726068fac16d6a0f9cb5922c64f /COPYING
parente0cbb078723ad521496c53ff84a9cd29d9dd327a (diff)
parent509b080847323905c2bfac3c3e0732fb38755847 (diff)
downloadShaarli-50df2cde744d514eb4cda9af305bf005f9879930.tar.gz
Shaarli-50df2cde744d514eb4cda9af305bf005f9879930.tar.zst
Shaarli-50df2cde744d514eb4cda9af305bf005f9879930.zip
Merge pull request #12 from nodiscc/iconslicense
fix icons license and general copyright information
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING50
1 files changed, 47 insertions, 3 deletions
diff --git a/COPYING b/COPYING
index d9731d27..0ba11e48 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,50 @@
1Shaarli is distributed under the zlib/libpng License: 1Files: *
2License: zlib/libpng
3Copyright: (c) 2011-2014 SĂ©bastien SAUVAGE <sebsauvage@sebsauvage.net>
4 (c) 2011-2014 Alexandre Alapetite <alexandre@alapetite.fr>
5 (c) 2011-2014 David Sferruzza <david.sferruzza@gmail.com>
6 (c) 2011-2014 Christophe HENRY <christophe.henry@sbgodin.fr>
7 (c) 2011-2014 Mathieu Chabanon <git@matchab.fr>
8 (c) 2011-2014 BoboTiG <bobotig@gmail.com>
9 (c) 2011-2014 Bronco <bronco@warriordudimanche.net>
10 (c) 2011-2014 Emilien Klein <emilien@klein.st>
11 (c) 2011-2014 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org>
12 (c) 2011-2014 Lionel Martin <renarddesmers@gmail.com>
13 (c) 2011-2014 lehollandaisvolant <levoltigeurhollandais@gmail.com>
14 (c) 2011-2014 timo van neerden <fire@lehollandaisvolant.net>
15 (c) 2011-2014 nodiscc <nodiscc@gmail.com>
16
17
18
19Files: 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
20License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
21Copyright: (c) 2014 Yusuke Kamiyamane
22Source: http://p.yusukekamiyamane.com/
23
24Files: images/delete_icon.png
25License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
26Copyright: (c) 2014 Designmodo
27Source: http://designmodo.com/linecons-free/
28
29
30Files: images/floral_left.png, images/floral_right.png, images/squiggle.png, images/squiggle2.png, images/squiggle_closing.png
31Licence: Public Domain
32Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg
33
34
35Files: images/Paper_texture_v5_by_bashcorpo_w1000.jpg
36Licence: Public Domain
37Source: http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998
38
39Files: images/logo.png
40License: zlib/libpng
41Copyright: (c) 2011-2014 idleman idleman@idleman.fr
42
43
44
45--------------------------------------------------------
46ZLIB/LIBPNG LICENSE
2 47
3Copyright (c) 2011 Sébastien SAUVAGE (sebsauvage.net)
4 48
5This software is provided 'as-is', without any express or implied warranty. 49This software is provided 'as-is', without any express or implied warranty.
6In no event will the authors be held liable for any damages arising from 50In no event will the authors be held liable for any damages arising from
@@ -18,4 +62,4 @@ freely, subject to the following restrictions:
18 2. Altered source versions must be plainly marked as such, and must 62 2. Altered source versions must be plainly marked as such, and must
19 not be misrepresented as being the original software. 63 not be misrepresented as being the original software.
20 64
21 3. This notice may not be removed or altered from any source distribution. 65 3. This notice may not be removed or altered from any source distribution. \ No newline at end of file