Mercurial > pidgin
diff libpurple/smiley.c @ 24099:d31ceef11df1
merge of 'aaddbdd76370264a6f95b6d787b565061e3b40d6'
and 'ab9a8e940ca290009deae6e3044bc352a0cd9223'
author | Kevin Stange <kevin@simguy.net> |
---|---|
date | Thu, 11 Sep 2008 20:58:15 +0000 |
parents | 90c7142de9d0 |
children | d8452c0bec7b |