comparison libpurple/privacy.h @ 30485:1efb52ff7ad0

merge of '4fc447ffec2a8d0d5fde9ccdb17acf825a5ccab5' and 'c1573675765ce94fa58152c4fc2af225ff621d47'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 17 May 2010 08:04:00 +0000
parents 828d21a1ec43
children 5876584828e8
comparison
equal deleted inserted replaced
30484:60ea80b5af53 30485:1efb52ff7ad0