Mercurial > pidgin.yaz
comparison libpurple/cipher.c @ 22754:19dffacf8638
merge of '6bf9ac8e017081c907061167edd28a1adcbec3c9'
and '91a643a04016322c0da1e540889a828686bb5d8d'
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Tue, 29 Apr 2008 03:57:06 +0000 |
parents | 76e0463db3aa |
children | 951bb9ca9d01 |
comparison
equal
deleted
inserted
replaced
22742:d4d57a5505ab | 22754:19dffacf8638 |
---|