comparison libpurple/protocols/jabber/chat.h @ 27591:f44eda839ea4

explicit merge of 'c273f8da9712cac21aae5bcbd3d4790f8ee78f79' and 'a90257133c31b066ad5d8e9df4fada3a482ccd82'
author Paul Aurich <paul@darkrain42.org>
date Thu, 16 Jul 2009 20:06:27 +0000
parents eeee4309d3d8
children c585572e80dd
comparison
equal deleted inserted replaced
27585:75e80bfa4101 27591:f44eda839ea4