Mercurial > pidgin.yaz
comparison libpurple/proxy.c @ 24661:d1d9d085d626
Fix up a bad merge on my part.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 12 Dec 2008 17:18:59 +0000 |
| parents | f3103f786c86 |
| children | 95ef7beb926b 9bc0c3274c3c |
comparison
equal
deleted
inserted
replaced
| 24660:8d49c8f019d9 | 24661:d1d9d085d626 |
|---|