Mercurial > pidgin.yaz
comparison pidgin/gtksmiley.h @ 25802:e3bb0bbfa388
Fix merge
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Tue, 02 Dec 2008 22:55:49 +0000 |
| parents | 99ef50c8da91 |
| children | f62c5b302b91 |
comparison
equal
deleted
inserted
replaced
| 25801:6f94b4a27372 | 25802:e3bb0bbfa388 |
|---|