Mercurial > pidgin
comparison libpurple/cipher.c @ 16302:03532b86c20f
merge of '1fec4b7f300a8ab8b7036a98e8ecc90808bbe5ca'
and '795a3d9baa3c96bae20af1c1bfa0b7179c0cac99'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 22 Apr 2007 18:20:05 +0000 |
parents | 32c366eeeb99 |
children | eca698c354d0 07cf49a0f404 |
comparison
equal
deleted
inserted
replaced
16297:aae14296a349 | 16302:03532b86c20f |
---|