Mercurial > pidgin
diff libpurple/proxy.h @ 15872:045f2e2b2de2
merge of '2ece6994d58f95af39f4e36b5e5b58116198188a'
and 'de1d579f1efd330d7acfb5a1a8e8e8957ca3ba54'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Thu, 22 Mar 2007 12:52:25 +0000 |
| parents | 32c366eeeb99 |
| children | 36b09c6f7957 |
