Mercurial > pidgin
comparison libpurple/smiley.h @ 26496:e80b41862cc0
merge of '22d261d19f56b8cec771b7511f11dbbc367568fc'
and '31a22532aee37e26e4131412a959ecb9575dc979'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 06 Apr 2009 06:11:24 +0000 |
parents | 013ec6fabd3f |
children | f22ecddd3eba |
comparison
equal
deleted
inserted
replaced
26493:2a34a32047ba | 26496:e80b41862cc0 |
---|