Mercurial > pidgin.yaz
comparison libpurple/smiley.c @ 26982:e22e1f45065d
merge of '6a6409370fa50e23bc8fdedcef230220fa680a36'
and 'dd33cca1c5e6f5f7ea4cb392ed2954841617c1f1'
author | Peter Hjalmarsson <xake@rymdraket.net> |
---|---|
date | Mon, 18 May 2009 19:54:24 +0000 |
parents | 584063555949 |
children | f22ecddd3eba 54efb427b91a |
comparison
equal
deleted
inserted
replaced
26981:47d963966c9a | 26982:e22e1f45065d |
---|