Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/message.c @ 31449:1c660ba17ba1
propagate from branch 'im.pidgin.pidgin' (head 6f879669a6513a5c40335bbaefe842389a92b39e)
to branch 'im.pidgin.cpw.qulogic.cairo' (head 4ab0199887f74442673fd46dcbb662bc7f070bc4)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 21 Nov 2010 20:30:12 +0000 |
parents | 25e200cb3532 |
children | c5ba7dd399fa a8cc50c2279f |
comparison
equal
deleted
inserted
replaced
31448:9a705087d64e | 31449:1c660ba17ba1 |
---|---|
28 #include "util.h" | 28 #include "util.h" |
29 #include "adhoccommands.h" | 29 #include "adhoccommands.h" |
30 #include "buddy.h" | 30 #include "buddy.h" |
31 #include "chat.h" | 31 #include "chat.h" |
32 #include "data.h" | 32 #include "data.h" |
33 #include "google.h" | 33 #include "google/google.h" |
34 #include "message.h" | 34 #include "message.h" |
35 #include "xmlnode.h" | 35 #include "xmlnode.h" |
36 #include "pep.h" | 36 #include "pep.h" |
37 #include "smiley.h" | 37 #include "smiley.h" |
38 #include "iq.h" | 38 #include "iq.h" |