Mercurial > pidgin.yaz
diff libpurple/smiley.h @ 30710:29e714e980b2
merge of 'c32c1fdff08db87b69fc0eb921a5eaafcb5ef67e'
and 'fcd99a6bb8c6362d64f295a1b95a5b1130460b85'
author | andrew.victor@mxit.com |
---|---|
date | Fri, 28 May 2010 21:10:09 +0000 |
parents | 63cb8c4f3c66 |
children | 02a2e8183b1d |