comparison libpurple/eventloop.h @ 25717:907ca9a36fe0

explicit merge of '714a7c7f903d11c96ffade34966121da549d998f' and 'd2c40fe4e2181eda5c1c631c7805f17e6b5d22c3' to branch 'org.darkrain42.pidgin.xmpp'
author Paul Aurich <paul@darkrain42.org>
date Thu, 20 Nov 2008 21:13:56 +0000
parents 3d7e9eff04d0
children dc3c31b78fdb
comparison
equal deleted inserted replaced
25614:94ccccab4e98 25717:907ca9a36fe0