Mercurial > pidgin.yaz
comparison pidgin/gtksmiley.c @ 31420:054309e46786
merge of '2b6c5a292658681aecfbe9f0c7f67cf62cfb28ec'
and 'e010a6a5ac862c38a6a99db5b6981a985f9b7fb6'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sun, 28 Nov 2010 08:22:09 +0000 |
parents | 351d07aefb09 |
children | 917c597beb97 |
comparison
equal
deleted
inserted
replaced
31413:0fa095abebd4 | 31420:054309e46786 |
---|