Mercurial > pidgin.yaz
diff pidgin/gtksmiley.c @ 32057:d034d1acfe03
merge of '75fc33a55bbcdb1cd95b14f424826226c67018b0'
and 'b9857c32002b782a67b23576214ef33234269032'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Thu, 12 May 2011 02:58:42 +0000 |
parents | 917c597beb97 |
children | e2c6e4fc3c84 |