summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-02-26 10:42:38 -0400
committerKali Kaneko <kali@leap.se>2014-02-26 10:42:38 -0400
commitf0346b77185dc353d6ac65308189fbe236ce2b44 (patch)
treec11b203beb2a8e813945cc4c6dfadc184dd8e6c0 /LICENSE
parent3e5e020e1e23f83cffa0a3579f0755401f18a9e7 (diff)
parent6650529db2f001718bb79eab34aee4d4830eb346 (diff)
Merge remote-tracking branch 'ivan-github/feature/add-pastebin-support' into develop
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE16
1 files changed, 15 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index bca70598..2ccb50e8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -674,8 +674,16 @@ Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--------------------------------------------------------------------------------
+We are "embedding" PastebinAPI class since currently the installation through
+pip does not work.
-Leap-client also uses third party icons:
+file: src/leap/bitmask/util/pastebin.py
+License: GPL
+Author: Ian Havelock
+website: https://github.com/Morrolan/PastebinAPI
+--------------------------------------------------------------------------------
+
+Bitmask also uses third party icons:
---
data/images/Arrow-Up-32.png
@@ -694,3 +702,9 @@ data/images/mail-unlocked.png
License: LGPL - http://www.gnu.org/licenses/lgpl.html
Website: http://www.oxygen-icons.org/
+--
+data/images/pastebin.png
+
+author: Marco Martin
+License: LGPL
+website: https://www.iconfinder.com/icons/7897/binary_icon