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