Mercurial > pidgin
diff ChangeLog.API @ 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 | 9a0f99ea664d |
| children | 8af9ebae439c |
| author | Andreas Monitzer <pidgin@monitzer.com> |
|---|---|
| date | Wed, 11 Jul 2007 23:27:12 +0000 |
| parents | 9a0f99ea664d |
| children | 8af9ebae439c |