Mercurial > pidgin
comparison libpurple/proxy.h @ 25872:cf6dfd38c7c1
Fix a botched line in the merge...
| author | Gary Kramlich <grim@reaperworld.com> |
|---|---|
| date | Sat, 13 Dec 2008 05:49:20 +0000 |
| parents | 67581872c47f |
| children | 4670851af098 |
comparison
equal
deleted
inserted
replaced
| 25871:65cfc59858cf | 25872:cf6dfd38c7c1 |
|---|