comparison libpurple/buddyicon.h @ 31719:e0856c50cdd8

Fix the merge some more I don't know whether this was me, kdiff3, or monotone on something.
author Paul Aurich <paul@darkrain42.org>
date Sun, 26 Jun 2011 20:37:03 +0000
parents 108455a3c019
children 79eb87d4a8e0
comparison
equal deleted inserted replaced
31718:f2a3c59fc4a6 31719:e0856c50cdd8