# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1178139477 0
# Node ID 9824b2568a9c77f36b5eea3147703474cfd92357
# Parent  6101faae5d92e9870629e64a7efaf16fb1e323c4# Parent  987882fcb49b58015cb519f3288acf2261df8c23
merge of 'adfb9df43624e2797f0706cd8d96efdec4640b26'
     and 'c18a49e36404c37efc3d284bfe1da26df4dad37b'

diff -r 987882fcb49b -r 9824b2568a9c pidgin/pixmaps/tray/16/Makefile.am
--- a/pidgin/pixmaps/tray/16/Makefile.am	Wed May 02 20:54:01 2007 +0000
+++ b/pidgin/pixmaps/tray/16/Makefile.am	Wed May 02 20:57:57 2007 +0000
@@ -15,9 +15,9 @@
 	busy_4bit.ico \
 	connecting_4bit.ico \
 	extended-away_4bit.ico \
+	invisible_4bit.ico \
 	message_4bit.ico \
-	offline_4bit.ico \
-	invisible_4bit.ico
+	offline_4bit.ico
 
 pidgintraypixdir = $(datadir)/pixmaps/pidgin/tray/16
 pidgintraypix_DATA = $(TRAY_ICONS)
diff -r 987882fcb49b -r 9824b2568a9c pidgin/pixmaps/tray/16/available_4bit.ico
Binary file pidgin/pixmaps/tray/16/available_4bit.ico has changed
diff -r 987882fcb49b -r 9824b2568a9c pidgin/pixmaps/tray/16/away_4bit.ico
Binary file pidgin/pixmaps/tray/16/away_4bit.ico has changed
diff -r 987882fcb49b -r 9824b2568a9c pidgin/pixmaps/tray/16/busy_4bit.ico
Binary file pidgin/pixmaps/tray/16/busy_4bit.ico has changed
diff -r 987882fcb49b -r 9824b2568a9c pidgin/pixmaps/tray/16/connecting_4bit.ico
Binary file pidgin/pixmaps/tray/16/connecting_4bit.ico has changed
diff -r 987882fcb49b -r 9824b2568a9c pidgin/pixmaps/tray/16/extended-away_4bit.ico
Binary file pidgin/pixmaps/tray/16/extended-away_4bit.ico has changed
diff -r 987882fcb49b -r 9824b2568a9c pidgin/pixmaps/tray/16/invisible_4bit.ico
Binary file pidgin/pixmaps/tray/16/invisible_4bit.ico has changed
diff -r 987882fcb49b -r 9824b2568a9c pidgin/pixmaps/tray/16/message_4bit.ico
Binary file pidgin/pixmaps/tray/16/message_4bit.ico has changed
diff -r 987882fcb49b -r 9824b2568a9c pidgin/pixmaps/tray/16/offline_4bit.ico
Binary file pidgin/pixmaps/tray/16/offline_4bit.ico has changed