Mercurial > pidgin
comparison libpurple/cipher.h @ 22232:cbf64b6f5d4a
merge of '04e7d54475c3ddf91ad523e3e58521bc4fa59c85'
and '8a96477df7545f48e81690f10a567c790af6ef81'
| author | Richard Nelson <wabz@pidgin.im> |
|---|---|
| date | Thu, 31 Jan 2008 04:37:40 +0000 |
| parents | f786e478e08b |
| children | 584063555949 |
comparison
equal
deleted
inserted
replaced
| 22231:4af9179e33df | 22232:cbf64b6f5d4a |
|---|
