diff libpurple/prpl.h @ 25884:212fb65cef7f

explicit merge of 'ba66150a2a1efc5a5cee7204adab69208825630e' and 'ac72bbedc88fef81dfdd1e2a4b2587010a030657'
author Richard Laager <rlaager@wiktel.com>
date Fri, 02 Jan 2009 22:10:31 +0000
parents d8452c0bec7b
children 9216da5184a2 68f4edb42f39
line wrap: on
line diff