comparison pidgin/pidginstock.h @ 28600:650b79eaf305

merge of '453bf3da68c1baca3d6585b338ac13df415c9be0' and 'aedf94cca64dd46503c2482445e6de4e9816b7df'
author Etan Reisner <pidgin@unreliablesource.net>
date Sun, 16 Aug 2009 05:29:25 +0000 (2009-08-16)
parents 5d71de58452c
children 1446436616d4 4548c114e953
comparison
equal deleted inserted replaced
28599:618c41ef0ab8 28600:650b79eaf305