Mercurial > pidgin
comparison libpurple/smiley.c @ 25113:d93578eb7244
merge of '3a9f71b3ea427344c6b6e95c63c3559bef222013'
and 'd370f99001126b27ce4cf920e66083b8ff7cd629'
author | Justin Rodriguez <ffdragon@soc.pidgin.im> |
---|---|
date | Wed, 06 Aug 2008 02:54:39 +0000 |
parents | 90c7142de9d0 |
children | d8452c0bec7b |
comparison
equal
deleted
inserted
replaced
25112:2ecd716746e6 | 25113:d93578eb7244 |
---|