Mercurial > pidgin
diff libpurple/proxy.c @ 18685:c03e3fe11ea9
Fixed errors created by merge conflict resolve mistakes.
author | Andreas Monitzer <pidgin@monitzer.com> |
---|---|
date | Wed, 11 Jul 2007 23:27:12 +0000 |
parents | 79ecaab86f91 |
children | 57d350900136 941965d6fd88 |