comparison libpurple/proxy.h @ 32176:f2a3c59fc4a6

Fix up merge
author Paul Aurich <paul@darkrain42.org>
date Sat, 25 Jun 2011 19:56:59 +0000
parents 3e11fa72c5d8
children ba74745ff179
comparison
equal deleted inserted replaced
32175:910e966d18b3 32176:f2a3c59fc4a6