From 649f93331671d3f2b5c53f3f34edd5a8ef47b66a Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Mon, 9 Jan 2012 18:02:48 +0000
Subject: [PATCH] Update AUTHORS

---
 AUTHORS                                 | 23 ++++++++++++++++++++---
 deluge/data/pixmaps/flags/FLAGS_LICENCE |  2 --
 deluge/ui/web/icons/LICENSE             | 20 --------------------
 deluge/ui/web/images/LICENSE            |  1 -
 4 files changed, 20 insertions(+), 26 deletions(-)
 delete mode 100644 deluge/data/pixmaps/flags/FLAGS_LICENCE
 delete mode 100644 deluge/ui/web/icons/LICENSE
 delete mode 100644 deluge/ui/web/images/LICENSE

diff --git a/AUTHORS b/AUTHORS
index c63a27b40..b2015c784 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,18 +37,23 @@ Plugin Developers:
 Images Authors:
 
     * files: deluge/data/pixmaps/*.svg, *.png
+             deluge/ui/web/icons/active.png, alert.png, all.png, checking.png, dht.png,
+             downloading.png, inactive.png, queued.png, seeding.png, traffic.png
+      exceptions: deluge/data/pixmaps/deluge.svg and derivatives
       copyright: Andrew Resch
       license: GPLv3
 
     * files: deluge/data/pixmaps/deluge.svg and derivatives
+             deluge/ui/web/icons/apple-pre-*.png, deluge*.png
+             deluge/ui/web/images/deluge*.png
       copyright: Andrew Wedderburn
       license: GPLv3
 
     * files: deluge/plugins/blocklist/blocklist/data/*.png
-         deluge/data/pixmaps/tracker_warning16.png, tracker_all16.png, lock48.png
+             deluge/data/pixmaps/tracker_warning16.png, tracker_all16.png, lock48.png
       copyright: Gnome Icon Theme
       license: GPLv2
-      url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme  
+      url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
 
     * files: deluge/data/pixmaps/magnet.png
       copyright: Woothemes
@@ -61,6 +66,18 @@ Images Authors:
       license: Public Domain
       url: http://famfamfam.com/lab/icons/flags/
 
+    * files: deluge/ui/web/icons/*.png
+      exceptions: apple-pre-*.png, active.png, alert.png, all.png, deluge.png, dht.png,
+                  downloading.png, inactive.png, queued.png, seeding.png, traffic.png
+      copyright: Yusuke Kamiyamane <p@yusukekamiyamane.com>
+      license: Creative Commons Attribution 3.0 License
+      url: http://p.yusukekamiyamane.com/
+
+    * files: deluge/ui/web/images/spinner.gif, spinner-split.gif
+      copyright: Steven Chim
+      license: BSD license
+      url: http://members.upc.nl/j.chim/ext/spinner2/ext-spinner.html
+
 Translation Contributors:
     * files: deluge/i18n/*.po
 
@@ -208,7 +225,7 @@ Translation Contributors:
     davidhjelm
     David Machakhelidze
     Dawid Dziurdzia
-    Daya Adianto 
+    Daya Adianto
     dcruz
     Deady
     Dereck Wonnacott
diff --git a/deluge/data/pixmaps/flags/FLAGS_LICENCE b/deluge/data/pixmaps/flags/FLAGS_LICENCE
deleted file mode 100644
index 9ae367bc7..000000000
--- a/deluge/data/pixmaps/flags/FLAGS_LICENCE
+++ /dev/null
@@ -1,2 +0,0 @@
-From: http://famfamfam.com/lab/icons/flags/
-"These flag icons are available for free use for any purpose with no requirement for attribution."
diff --git a/deluge/ui/web/icons/LICENSE b/deluge/ui/web/icons/LICENSE
deleted file mode 100644
index 5323622b0..000000000
--- a/deluge/ui/web/icons/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Icons in this folder are copied from the fruge icon set, taken from
-http://www.pinvoke.com, licensed under the Creative Common
-Attribution-ShareAlike 3.0 License.
-
-Exceptions
-==========
-apple-pre-57.png
-apple-pre-72.png
-apple-pre-114.png
-
-active.png
-alert.png
-all.png
-deluge.png
-dht.png
-downloading.png
-inactive.png
-queued.png
-seeding.png
-traffic.png
diff --git a/deluge/ui/web/images/LICENSE b/deluge/ui/web/images/LICENSE
deleted file mode 100644
index 6b7f3f660..000000000
--- a/deluge/ui/web/images/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-The spinner.gif and spinner-split.gif are part of the Spinner plugin for Extjs, under the BSD license.