Mercurial > pidgin
comparison libpurple/protocols/jabber/pep.h @ 24945:25aadd8c3ec7
Fix merge.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sun, 19 Oct 2008 04:55:34 +0000 |
| parents | 85fc34efe733 |
| children | ba362a67278c 5767b7698c73 |
comparison
equal
deleted
inserted
replaced
| 24944:8bfa1f01f035 | 24945:25aadd8c3ec7 |
|---|