Mercurial > pidgin
comparison libpurple/smiley.c @ 25984:9115f71ad73a
Fixing busted merge
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 07 Mar 2009 22:40:30 +0000 |
| parents | 584063555949 |
| children | f22ecddd3eba 54efb427b91a |
comparison
equal
deleted
inserted
replaced
| 25983:9ea3474065dc | 25984:9115f71ad73a |
|---|