Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/iq.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 | 5c1ed6296b56 |
| children | 413103ddeaac |
comparison
equal
deleted
inserted
replaced
| 18684:5c1ed6296b56 | 18685:c03e3fe11ea9 |
|---|