Mercurial > pidgin
comparison README @ 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 | 56042b2f8b64 |
| children |
comparison
equal
deleted
inserted
replaced
| 19487:c9de28101e6d | 19488:ebe2d2e71223 |
|---|
