Mercurial > pidgin.yaz
diff libpurple/dnsquery.h @ 27667:f44eda839ea4
explicit merge of 'c273f8da9712cac21aae5bcbd3d4790f8ee78f79'
and 'a90257133c31b066ad5d8e9df4fada3a482ccd82'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Thu, 16 Jul 2009 20:06:27 +0000 |
parents | 70403d57afe6 |
children | 1ef332689ea2 |