comparison libpurple/cipher.c @ 30435:d487a2adc3a6

merge of '86d9ff7ca5af691007b1e85ef39959fa13e7d996' and 'd0cbcbb1a25505fd8801dd556c1ec42e98414c9a'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 23 Aug 2010 05:22:11 +0000
parents 279c6cfe6966
children 8a15b164ef30
comparison
equal deleted inserted replaced
30423:cc75490da0e3 30435:d487a2adc3a6