Mercurial > pidgin
comparison ChangeLog @ 19488:ebe2d2e71223
Fixed merge errors stemming from the fact that the main branch and my branch both added something to the prpl struct
| author | Andreas Monitzer <pidgin@monitzer.com> |
|---|---|
| date | Tue, 28 Aug 2007 07:09:48 +0000 |
| parents | bb5ec4f1e25b |
| children | 74befdcd0454 |
comparison
equal
deleted
inserted
replaced
| 19487:c9de28101e6d | 19488:ebe2d2e71223 |
|---|
