comparison pidgin/pidgin.h @ 18832:140662c8280c

merge of '599ce70692fe573e98628269564b76296451b587' and 'bbcb8341b26dc1c43b844d99930c771cf6e64246'
author Will Thompson <will.thompson@collabora.co.uk>
date Tue, 07 Aug 2007 11:32:56 +0000
parents 816759ae9644
children b2578b2d4bc4
comparison
equal deleted inserted replaced
18831:d57926990768 18832:140662c8280c