Mercurial > pidgin
comparison finch/plugins/gnthistory.c @ 25228:6fed1bb3b02e
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 17 Dec 2008 18:23:36 +0000 |
parents | 6bb29f94862c |
children | bd84462b0e17 cc1e35fa774d |
comparison
equal
deleted
inserted
replaced
25227:9100b9176a16 | 25228:6fed1bb3b02e |
---|