comparison libpurple/cipher.c @ 32574:4b53d875529f

fixed conflicts in previous merge.
author tdrhq@soc.pidgin.im
date Wed, 26 Aug 2009 03:19:30 +0000
parents da33da2e1a1e
children 279c6cfe6966
comparison
equal deleted inserted replaced
32573:1ca2df744414 32574:4b53d875529f