diff libpurple/smiley.c @ 25533:eb73cc0b2085

merge of '21e96c2781026be159ef9d16095e34151c421fbc' and '8ac7bfcea95abcd7f1d1cc3ca92c3453c4704fb3'
author Evan Schoenberg <evan.s@dreskin.net>
date Wed, 25 Feb 2009 21:56:47 +0000
parents d8452c0bec7b
children 584063555949
line wrap: on
line diff