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