comparison libpurple/protocols/jabber/data.h @ 26728:d06af7664a7a

merge of '6a70c2c1325aeb644bff8476f94c5a25f83044fb' and 'd5a487de6cafd4f773a3cc1b9b08d6081771e9de'
author Marcus Lundblad <ml@update.uu.se>
date Wed, 22 Apr 2009 18:37:31 +0000
parents 5767b7698c73
children 8c991e09efcb 51bc0be83108
comparison
equal deleted inserted replaced
26716:474a0cb44f58 26728:d06af7664a7a