Mercurial > pidgin
comparison libpurple/cipher.h @ 31255:65999cb4fc40
merge of '4f105e3377f4f4857b76c46669e414e45bdde0d1'
and 'b84653f183486a9171a8900c372a9e8545d3b03b'
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Mon, 21 Feb 2011 22:57:30 +0000 |
parents | 2b041e31b825 |
children | 5876584828e8 |
comparison
equal
deleted
inserted
replaced
31246:97cb163727f0 | 31255:65999cb4fc40 |
---|