comparison libpurple/protocols/jabber/pep.h @ 22031:9bfdf68d185c

merge of '5fc55e3a78ccb0a463df332592e62c5a371cd8b4' and 'ca3452eca310a510c6932f9a618b79da824d796a'
author Mark Doliner <mark@kingant.net>
date Mon, 07 Jan 2008 16:28:25 +0000
parents 0f0e98978d66
children 85fc34efe733 26eabe8e739b
comparison
equal deleted inserted replaced
22030:21ed56853648 22031:9bfdf68d185c