diff libpurple/connection.h @ 25219:e958c6335136

merge of '1f1c4d53b190a6818acec7b4a5469c4a4db37759' and '8da5e7cc30ef10db3b7f61496928b6dccfdf34d4'
author Marcus Lundblad <ml@update.uu.se>
date Mon, 29 Sep 2008 17:29:02 +0000
parents 85fc34efe733
children 8282911d5e17 9ded0fb57e1c 0efd688ed086
line wrap: on
line diff