Mercurial > pidgin
comparison po/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 | 5538762c5ca7 |
children | da5c044a2437 |
comparison
equal
deleted
inserted
replaced
19487:c9de28101e6d | 19488:ebe2d2e71223 |
---|