comparison libpurple/smiley.c @ 26923:b0f61cb90f62

merge of '136cd28c47ef3338b71082503a83a7ecf465df78' and 'ff8ea4e7234c104731c595807e704422ab97acaf'
author Paul Aurich <paul@darkrain42.org>
date Thu, 07 May 2009 05:23:15 +0000
parents 584063555949
children f22ecddd3eba 54efb427b91a
comparison
equal deleted inserted replaced
26922:c637ddabb491 26923:b0f61cb90f62