comparison libpurple/proxy.h @ 29809:b0f1698c52f8

propagate from branch 'im.pidgin.pidgin' (head fd01d69465dca1c23c811963e2545236c2749d55) to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head a565e5aaa067913f555e96099205782f530ce9a7)
author Marcus Lundblad <ml@update.uu.se>
date Sun, 29 Nov 2009 19:06:30 +0000
parents 4c3b1bb3ba91
children 9a7c5d242521
comparison
equal deleted inserted replaced
29808:59510eac0bdf 29809:b0f1698c52f8