comparison libpurple/protocols/jabber/data.h @ 30927:c3b32b027d9d

propagate from branch 'im.pidgin.pidgin' (head 29f6b9d81574bfa9235dbd438a8934f06552e368) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 7e11dae4b92b8ef950ff2a1ab3ed673b56d4f772)
author Marcus Lundblad <ml@update.uu.se>
date Sun, 20 Sep 2009 19:56:50 +0000
parents 7921a53b94b3
children 7b4ade7c6d8a 7763697a85c8
comparison
equal deleted inserted replaced
28646:5f97830906bc 30927:c3b32b027d9d