comparison libpurple/dnsquery.c @ 26001:9115f71ad73a

Fixing busted merge
author Paul Aurich <paul@darkrain42.org>
date Sat, 07 Mar 2009 22:40:30 +0000
parents 1596d09393cf
children 8290e36a5a73
comparison
equal deleted inserted replaced
25465:9ea3474065dc 26001:9115f71ad73a