Mercurial > pidgin.yaz
comparison libpurple/cipher.h @ 17329:c4bd017a825e
merge of '8bb110590d07631c51fb0be00d16deee9b1ec0d9'
and '90f8de2e2449d8db7f55ac5abe26e264d9a76e12'
author | Jeffrey Connelly <jaconnel@calpoly.edu> |
---|---|
date | Fri, 01 Jun 2007 04:47:54 +0000 |
parents | 516f14bef90e |
children | 2177a11e169d |
comparison
equal
deleted
inserted
replaced
17326:57bde8784308 | 17329:c4bd017a825e |
---|