diff libpurple/smiley.c @ 27903:56770cc3287d

merge of '20320727f6c8f5a4a4b7b8c0f65c74a57ada1e15' and '693f34aeef5794c9381068260ba79c542090e3fb'
author maiku@pidgin.im
date Thu, 13 Aug 2009 07:28:12 +0000
parents 584063555949
children f22ecddd3eba 54efb427b91a
line wrap: on
line diff