Mercurial > pidgin.yaz
comparison pidgin/gtksmiley.c @ 32350:a330d1187fa7
merge of 'abe467cd836e25b339d81461c056f6289d88b2f0'
and 'c13c35c07888cc787731bd388eb99734c41f67ef'
author | pieter.loubser@mxit.com |
---|---|
date | Tue, 16 Aug 2011 05:38:01 +0000 |
parents | e2c6e4fc3c84 |
children | 904686722499 |
comparison
equal
deleted
inserted
replaced
32335:98ae4b8b592f | 32350:a330d1187fa7 |
---|