Mercurial > pidgin.yaz
comparison libpurple/smiley.h @ 24647:34b02adafd9b
merge of 'dd536145a4036177cabc4e4e1ac83dcdf1008a33'
and 'fdb452e89c3d4140034ff12f06a8c3daf350ae5d'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Thu, 11 Dec 2008 22:36:47 +0000 |
parents | 013ec6fabd3f |
children | f22ecddd3eba |
comparison
equal
deleted
inserted
replaced
24646:36851084b5f2 | 24647:34b02adafd9b |
---|