Mercurial > pidgin
comparison libpurple/dnssrv.c @ 20096:2a9f3a499b0d
merge of '34d642b12b7215d55fd032cd513a7e225715f19a'
and '7868c3b2b7d17c52916e4bb76305b7e3b68d3904'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Mon, 17 Sep 2007 03:47:45 +0000 |
parents | 6bf32c9e15a7 |
children | 84c80c8b0e40 aa875e77e5ce |
comparison
equal
deleted
inserted
replaced
19936:191fa8a8c0bc | 20096:2a9f3a499b0d |
---|---|
1 /** | 1 /** |
2 * @file dnssrv.c | 2 * @file dnssrv.c |
3 * | 3 */ |
4 * purple | 4 |
5 /* purple | |
5 * | 6 * |
6 * Copyright (C) 2005 Thomas Butter <butter@uni-mannheim.de> | 7 * Copyright (C) 2005 Thomas Butter <butter@uni-mannheim.de> |
7 * | 8 * |
8 * This program is free software; you can redistribute it and/or modify | 9 * This program is free software; you can redistribute it and/or modify |
9 * it under the terms of the GNU General Public License as published by | 10 * it under the terms of the GNU General Public License as published by |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 * GNU General Public License for more details. | 17 * GNU General Public License for more details. |
17 * | 18 * |
18 * You should have received a copy of the GNU General Public License | 19 * You should have received a copy of the GNU General Public License |
19 * along with this program; if not, write to the Free Software | 20 * along with this program; if not, write to the Free Software |
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
21 */ | 22 */ |
22 | 23 |
23 #include "internal.h" | 24 #include "internal.h" |
24 #include "util.h" | 25 #include "util.h" |
25 | 26 |