comparison libpurple/network.h @ 31381:ccaa215ad56b

merge of '235da67d85fa24f86f8a6e0b743c070914f23a45' and 'eaeb839d23b9ccd56b6f8b0f9e014d57c273f5bf'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 21 Nov 2010 10:03:02 +0000
parents 1cdae196aac8
children 44f53d3fc54f
comparison
equal deleted inserted replaced
31380:9877f1307a0d 31381:ccaa215ad56b