merge of 'f72d986c8e3f7cd65a4322aa4ed4c2b650e22cea'

Thu, 03 May 2007 19:16:24 +0000

author
Stu Tomlinson <nosnilmot@pidgin.im>
date
Thu, 03 May 2007 19:16:24 +0000
changeset 16887
72fcf7e63c95
parent 16886
f72d986c8e3f (current diff)
parent 16884
ca5b441bcc47 (diff)
child 16888
10ec3eef653e
child 16891
6dfc8fe0eed1

merge of 'f72d986c8e3f7cd65a4322aa4ed4c2b650e22cea'
and 'ca5b441bcc47df2f232c477e2722df255b5a7efe'

--- a/pidgin/pixmaps/tray/22/Makefile.am	Thu May 03 19:13:08 2007 +0000
+++ b/pidgin/pixmaps/tray/22/Makefile.am	Thu May 03 19:16:24 2007 +0000
@@ -1,4 +1,4 @@
-SUBSIRS = scalable
+SUBDIRS = scalable
 
 TRAY_ICONS =	tray-away.png \
 		tray-busy.png \

mercurial