Merge branch 'pull'

26 files changed, 2 insertions, 1 deletions

diff --git a/images/icons/10/audio.png b/images/icons/10/audio.png
new file mode 100644
index 000000000..cfc2fdcbd
--- /dev/null
+++ b/images/icons/10/audio.png
diff --git a/images/icons/10/image.png b/images/icons/10/image.png
new file mode 100644
index 000000000..dce827bbe
--- /dev/null
+++ b/images/icons/10/image.png
diff --git a/images/icons/10/text.png b/images/icons/10/text.png
new file mode 100644
index 000000000..a9995ea4d
--- /dev/null
+++ b/images/icons/10/text.png
diff --git a/images/icons/10/video.png b/images/icons/10/video.png
new file mode 100644
index 000000000..4a3dacf96
--- /dev/null
+++ b/images/icons/10/video.png
diff --git a/images/icons/10/zip.png b/images/icons/10/zip.png
new file mode 100644
index 000000000..b90ab104a
--- /dev/null
+++ b/images/icons/10/zip.png
diff --git a/images/icons/16/audio.png b/images/icons/16/audio.png
new file mode 100644
index 000000000..f2b99981f
--- /dev/null
+++ b/images/icons/16/audio.png
diff --git a/images/icons/16/image.png b/images/icons/16/image.png
new file mode 100644
index 000000000..c52b9730d
--- /dev/null
+++ b/images/icons/16/image.png
diff --git a/images/icons/16/text.png b/images/icons/16/text.png
new file mode 100644
index 000000000..1f3433a56
--- /dev/null
+++ b/images/icons/16/text.png
diff --git a/images/icons/16/video.png b/images/icons/16/video.png
new file mode 100644
index 000000000..bd1a7bb57
--- /dev/null
+++ b/images/icons/16/video.png
diff --git a/images/icons/16/zip.png b/images/icons/16/zip.png
new file mode 100644
index 000000000..f0fbc0dbf
--- /dev/null
+++ b/images/icons/16/zip.png
diff --git a/images/icons/22/audio.png b/images/icons/22/audio.png
new file mode 100644
index 000000000..dbf4675cf
--- /dev/null
+++ b/images/icons/22/audio.png
diff --git a/images/icons/22/image.png b/images/icons/22/image.png
new file mode 100644
index 000000000..f00e3a290
--- /dev/null
+++ b/images/icons/22/image.png
diff --git a/images/icons/22/text.png b/images/icons/22/text.png
new file mode 100644
index 000000000..d35e45ff8
--- /dev/null
+++ b/images/icons/22/text.png
diff --git a/images/icons/22/video.png b/images/icons/22/video.png
new file mode 100644
index 000000000..eca481ff1
--- /dev/null
+++ b/images/icons/22/video.png
diff --git a/images/icons/22/zip.png b/images/icons/22/zip.png
new file mode 100644
index 000000000..4d4ecbe9a
--- /dev/null
+++ b/images/icons/22/zip.png
diff --git a/images/icons/48/audio.png b/images/icons/48/audio.png
new file mode 100644
index 000000000..23f49b54d
--- /dev/null
+++ b/images/icons/48/audio.png
diff --git a/images/icons/48/image.png b/images/icons/48/image.png
new file mode 100644
index 000000000..cc0c86872
--- /dev/null
+++ b/images/icons/48/image.png
diff --git a/images/icons/48/text.png b/images/icons/48/text.png
new file mode 100644
index 000000000..502394547
--- /dev/null
+++ b/images/icons/48/text.png
diff --git a/images/icons/48/video.png b/images/icons/48/video.png
new file mode 100644
index 000000000..dde02f600
--- /dev/null
+++ b/images/icons/48/video.png
diff --git a/images/icons/48/zip.png b/images/icons/48/zip.png
new file mode 100644
index 000000000..08a9330c4
--- /dev/null
+++ b/images/icons/48/zip.png
diff --git a/images/icons/Makefile b/images/icons/Makefile
index 00c4fa4c2..bfb5927df 100755
--- a/images/icons/Makefile
+++ b/images/icons/Makefile
@@ -2,7 +2,8 @@
 IMAGES=add.png edit.png	gear.png info.png menu.png \
 		notify_off.png star.png  delete.png feed.png group.png \
 		lock.png notice.png notify_on.png user.png link.png \
-		play.png plugin.png unlock.png
+		play.png plugin.png unlock.png zip.png audio.png video.png \
+		image.png text.png
 
 DESTS=10/ 16/ 22/ 48/ \
 		$(addprefix 10/, $(IMAGES)) \
diff --git a/images/icons/audio.png b/images/icons/audio.png
new file mode 100644
index 000000000..1e1561266
--- /dev/null
+++ b/images/icons/audio.png
diff --git a/images/icons/image.png b/images/icons/image.png
new file mode 100644
index 000000000..cec105bfd
--- /dev/null
+++ b/images/icons/image.png
diff --git a/images/icons/text.png b/images/icons/text.png
new file mode 100644
index 000000000..c20190ce2
--- /dev/null
+++ b/images/icons/text.png
diff --git a/images/icons/video.png b/images/icons/video.png
new file mode 100644
index 000000000..467a2123e
--- /dev/null
+++ b/images/icons/video.png
diff --git a/images/icons/zip.png b/images/icons/zip.png
new file mode 100644
index 000000000..df961dd49
--- /dev/null
+++ b/images/icons/zip.png