comparison libpurple/core.h @ 30972:4d8569be274c

merge of '392709af0c706d582bbd6a2b1f0d9423457e6351' and 'b1c7aabc888f764a6ed12bd30699c654534ea253'
author Marcus Lundblad <ml@update.uu.se>
date Mon, 06 Sep 2010 19:41:27 +0000
parents 2f66ad9c32a9
children 44f53d3fc54f
comparison
equal deleted inserted replaced
30925:d69ddbc0772f 30972:4d8569be274c