comparison libpurple/protocols/jabber/jabber.h @ 30240:885ceb384678

propagate from branch 'im.pidgin.pidgin' (head f23de15cf5cab74ad9b1c2ce72676be0e80e7f23) to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head f7a917c6041411a0428726f88f9200290adde6de)
author Marcus Lundblad <ml@update.uu.se>
date Sun, 21 Mar 2010 19:44:45 +0000
parents 6e598ca344b3
children 3ac7f10d13d4
comparison
equal deleted inserted replaced
30027:fce17268c9ec 30240:885ceb384678