merge backout branch

6914546f · Yann Leboulanger · 21ffce89 · e9264abb · 6914546f · 6914546f
Commit 6914546f authored 15 years ago by Yann Leboulanger
--- a/THANKS.artists
+++ b/THANKS.artists
@@ -2,7 +2,9 @@ Anders Ström
 Christophe Got
 Dennis Craven
 Guillaume Morin
+Gvorcek Spajreh
 Josef Vybíral
 Membris Khan
 Rederick Asher
 Jakub Szypulka
+
--- a/data/iconsets/wroop/16x16/away.png
+++ b/data/iconsets/wroop/16x16/away.png
--- a/data/iconsets/wroop/16x16/chat.png
+++ b/data/iconsets/wroop/16x16/chat.png
--- a/data/iconsets/wroop/16x16/closed.png
+++ b/data/iconsets/wroop/16x16/closed.png
--- a/data/iconsets/wroop/16x16/connecting.gif
+++ b/data/iconsets/wroop/16x16/connecting.gif
--- a/data/iconsets/wroop/16x16/dnd.png
+++ b/data/iconsets/wroop/16x16/dnd.png
--- a/data/iconsets/wroop/16x16/error.png
+++ b/data/iconsets/wroop/16x16/error.png
--- a/data/iconsets/wroop/16x16/event.gif
+++ b/data/iconsets/wroop/16x16/event.gif
--- a/data/iconsets/wroop/16x16/invisible.png
+++ b/data/iconsets/wroop/16x16/invisible.png
--- a/data/iconsets/wroop/16x16/muc_active.png
+++ b/data/iconsets/wroop/16x16/muc_active.png
--- a/data/iconsets/wroop/16x16/muc_inactive.png
+++ b/data/iconsets/wroop/16x16/muc_inactive.png
--- a/data/iconsets/wroop/16x16/not_in_roster.png
+++ b/data/iconsets/wroop/16x16/not_in_roster.png
--- a/data/iconsets/wroop/16x16/offline.png
+++ b/data/iconsets/wroop/16x16/offline.png
--- a/data/iconsets/wroop/16x16/online.png
+++ b/data/iconsets/wroop/16x16/online.png
--- a/data/iconsets/wroop/16x16/opened.png
+++ b/data/iconsets/wroop/16x16/opened.png
--- a/data/iconsets/wroop/16x16/requested.png
+++ b/data/iconsets/wroop/16x16/requested.png
--- a/data/iconsets/wroop/16x16/xa.png
+++ b/data/iconsets/wroop/16x16/xa.png
--- a/data/iconsets/wroop/32x32/away.png
+++ b/data/iconsets/wroop/32x32/away.png
--- a/data/iconsets/wroop/32x32/chat.png
+++ b/data/iconsets/wroop/32x32/chat.png
--- a/data/iconsets/wroop/32x32/dnd.png
+++ b/data/iconsets/wroop/32x32/dnd.png