diff libpurple/buddyicon.h @ 32176:f2a3c59fc4a6

Fix up merge
author Paul Aurich <paul@darkrain42.org>
date Sat, 25 Jun 2011 19:56:59 +0000
parents 108455a3c019
children 79eb87d4a8e0
line wrap: on
line diff