Mercurial > pidgin
comparison libpurple/smiley.h @ 26767:47d03538ee3f
Fix a bad merge (*sigh*)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Fri, 01 May 2009 18:57:44 +0000 |
| parents | 0c4976fb5f57 |
| children | 54efb427b91a |
comparison
equal
deleted
inserted
replaced
| 26766:9331016df8ac | 26767:47d03538ee3f |
|---|