Mercurial > pidgin.yaz
comparison libpurple/server.c @ 26243:90ffe6f71fa9
clearing conflicts while merging from im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
author | Sulabh Mahajan <sulabh@soc.pidgin.im> |
---|---|
date | Tue, 20 Jan 2009 17:11:35 +0000 |
parents | 00420530cc56 |
children | 18858e645788 5ebfa814b9e8 bcad7dc4b453 b5e2be33a17a |
comparison
equal
deleted
inserted
replaced
26242:97c420d62381 | 26243:90ffe6f71fa9 |
---|