diff libpurple/smiley.c @ 27009:ef132bfb0793

merge of '4ba10f028ed5e73f7fe9f00b3131844819ed85a6' and '70479082260072a56b0aea40ccca311822c17155'
author Etan Reisner <pidgin@unreliablesource.net>
date Fri, 22 May 2009 00:38:45 +0000
parents 584063555949
children f22ecddd3eba 54efb427b91a
line wrap: on
line diff