comparison libpurple/connection.h @ 30654:c31e1c0cf27f

merge of '0a7239b54affab8c6c4a3a097560826d888cf991' and 'f517ebc8991b2eeeae57b5bed9f2cef7899f60ba'
author Marcus Lundblad <ml@update.uu.se>
date Wed, 30 Jun 2010 21:34:50 +0000
parents 3e5bb4e2334c
children af709c6ab032
comparison
equal deleted inserted replaced
30651:f30a02140f74 30654:c31e1c0cf27f