diff libpurple/protocols/jabber/jingle/iceudp.h @ 27591:f44eda839ea4

explicit merge of 'c273f8da9712cac21aae5bcbd3d4790f8ee78f79' and 'a90257133c31b066ad5d8e9df4fada3a482ccd82'
author Paul Aurich <paul@darkrain42.org>
date Thu, 16 Jul 2009 20:06:27 +0000
parents 0c8d41f5caa0
children c585572e80dd
line wrap: on
line diff