Mercurial > pidgin.yaz
comparison pidgin/pidginstock.c @ 25802:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 8fa87801e203 |
children | aa1fe87558d8 25e2ab1fff1d a0fd6a41d127 |
comparison
equal
deleted
inserted
replaced
25801:6f94b4a27372 | 25802:e3bb0bbfa388 |
---|