summaryrefslogtreecommitdiff
path: root/theme/base/images
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-26 09:35:28 -0800
committerBrion Vibber <brion@pobox.com>2010-02-26 09:35:28 -0800
commit8dfc8f1635940b096e7f4025e3aef0ca4f909eb2 (patch)
tree9fce4aa765d56496031698f219da2f0f82b33e80 /theme/base/images
parent8914b69d5055c1bc7d0604ee338ffdaf6b0a8606 (diff)
parentb331e971b055386a126aaec27d661f26ba3b813c (diff)
Merge branch 'testing' into 0.9.x
Diffstat (limited to 'theme/base/images')
-rw-r--r--theme/base/images/icons/README54
-rw-r--r--theme/base/images/icons/icon_geo.pngbin894 -> 0 bytes
-rw-r--r--theme/base/images/icons/icons-01.gifbin3870 -> 3740 bytes
3 files changed, 54 insertions, 0 deletions
diff --git a/theme/base/images/icons/README b/theme/base/images/icons/README
new file mode 100644
index 000000000..ea582149f
--- /dev/null
+++ b/theme/base/images/icons/README
@@ -0,0 +1,54 @@
+/**
+ * @author Paul Jarvis http://code.google.com/p/twotiny/
+ * @license http://dev.perl.org/licenses/ Artistic License/GPL
+ * @note
+ White left arrow with green background
+ White right arrow with green background
+ White clip with green background
+ White heart with green background
+ White reply with green background
+ White garbage with green background
+ White pencil with green background
+ White envelope with green background
+ White speech bubble with green background
+ White shield with green background
+ White asterisk with green background
+ White x with green background
+ White plus with green background
+ White minus with green background
+ White skull with green background
+ White recycle with green background
+ White external with green background
+ White key with green background
+ White flag with green background
+ White checkmark with green background
+ White reject with green background
+ White play with green background
+ White pause with green background
+ */
+
+
+/**
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2008-2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ * @note
+ Green clip with transparent background
+ Green heart with white background
+ White person with tie with green background
+ White sherif badge with green background
+ White boxes with green background
+ White speech bubble broken with green background
+ Green recycle with transparent background
+ Green pin with white background
+ White pin with green background
+ White underscore with green background
+ White C with green background
+ */
+
+Created by various authors
+* FOAF icon from http://iandavis.com/2006/foaf-icons/ with Public Domain license
+* Atom feed icon from http://intertwingly.net/wiki/pie/Icon with Public Domain license
+* RSS feed icon from http://www.feedicons.com/ (Mozilla, Microsoft, Matt Brett) with MPL/GPL/LGPL tri-license
+* Processing icon from/by Unknown with Unknown license //FIXME
diff --git a/theme/base/images/icons/icon_geo.png b/theme/base/images/icons/icon_geo.png
deleted file mode 100644
index 8df245699..000000000
--- a/theme/base/images/icons/icon_geo.png
+++ /dev/null
Binary files differ
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index 6f284f023..be884ff48 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
Binary files differ