Mercurial > pidgin
comparison finch/finch.h @ 25209:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | ad357ca94de9 |
children | f7c5bb2f6623 |
comparison
equal
deleted
inserted
replaced
25208:6f94b4a27372 | 25209:e3bb0bbfa388 |
---|