Mercurial > pidgin
comparison libpurple/cipher.h @ 31835:36011b558d3e
merge of '1b0275bd7ec6ff5c9cb2a1b7a0a60c36091448a6'
and '807d1abbfdb467f3e6b995ae329f287a13a1b093'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sat, 19 Mar 2011 19:38:55 +0000 |
parents | 2b041e31b825 |
children | 5876584828e8 |
comparison
equal
deleted
inserted
replaced
31828:da81195f635e | 31835:36011b558d3e |
---|