Mercurial > pidgin.yaz
diff .mtn-ignore @ 19137:51772173a916
Fixed a few merge errors
author | Eric Polino <aluink@pidgin.im> |
---|---|
date | Fri, 06 Jul 2007 01:08:22 +0000 |
parents | 92821180bded |
children | 4c454d1a6f85 43a55528ff26 042b64016a57 |
author | Eric Polino <aluink@pidgin.im> |
---|---|
date | Fri, 06 Jul 2007 01:08:22 +0000 |
parents | 92821180bded |
children | 4c454d1a6f85 43a55528ff26 042b64016a57 |