Simon Kelley 5a4120dbfb Merge branch 'master' into dnssec ...

Conflicts:
	src/dnsmasq.h
	src/forward.c
	src/option.c

2013-10-25 13:16:27 +01:00

bld

Merge branch 'master' into dnssec

2013-10-25 13:16:27 +01:00

contrib

macscript: create file if it doesn't exist.

2013-09-27 21:07:30 +01:00

dbus

SetDomainServers Dbus method.

2012-12-01 21:02:15 +00:00

debian

Tweak tag->debian package version code so rc tags are later than test ones.

2013-10-02 14:52:23 +01:00

logo

tweak favicon

2012-04-02 20:40:34 +01:00

man

Update French translation.

2013-10-25 10:05:22 +01:00

po

Update French translation.

2013-10-25 10:05:22 +01:00

src

Merge branch 'master' into dnssec

2013-10-25 13:16:27 +01:00

.gitignore

Add "baseline" and "bloatcheck" makefile targets

2013-09-12 15:05:47 +01:00

Android.mk

import of dnsmasq-2.57.tar.gz

2012-01-05 17:31:15 +00:00

CHANGELOG

Fix caching of dangling CNAMEs.

2013-10-15 10:20:13 +01:00

CHANGELOG.archive

import of dnsmasq-2.48.tar.gz

2012-01-05 17:31:14 +00:00

COPYING

import of dnsmasq-2.0.tar.gz

2012-01-05 17:31:10 +00:00

COPYING-v3

import of dnsmasq-2.41.tar.gz

2012-01-05 17:31:13 +00:00

dnsmasq.conf.example

Add --ipset option.

2013-02-22 21:44:08 +00:00

doc.html

Minimal update of doc.html - remove broken links and add git info.

2012-01-06 20:39:54 +00:00

FAQ

FAQ typos.

2013-04-15 14:31:52 +01:00

Makefile

Merge branch 'master' into dnssec

2013-10-25 13:16:27 +01:00

setup.html

import of dnsmasq-2.58.tar.gz

2012-01-05 17:31:15 +00:00

VERSION

VERSION file

2012-01-05 22:00:08 +00:00

Description

No description provided

17 MiB

Languages

C 94.2%

Perl 2.3%

HTML 1.2%

Shell 1.1%

Makefile 0.6%

Other 0.6%