comparison libpurple/proxy.h @ 31782:727edf2625f5

Patch up merge
author Ethan Blanton <elb@pidgin.im>
date Thu, 11 Aug 2011 14:45:26 +0000
parents 3e11fa72c5d8
children ba74745ff179 3828a61c44da
comparison
equal deleted inserted replaced
31781:ac43f26c7f61 31782:727edf2625f5