]> git.ipfire.org Git - people/ms/dnsmasq.git/commit
Merge branch 'master' into dnssec
authorSimon Kelley <simon@thekelleys.org.uk>
Thu, 12 Dec 2013 12:16:17 +0000 (12:16 +0000)
committerSimon Kelley <simon@thekelleys.org.uk>
Thu, 12 Dec 2013 12:16:17 +0000 (12:16 +0000)
commitc352dd8f1a71784b78dce3fb6c941a8566dc6f6f
tree48c1fcdbab5adde78c64f0e630a85f670508c007
parent3a2371527ff3383526e9c1f38d4a08010009ffd6
parent56ad6c9be1b48791edfb140f87c3738dd723d116
Merge branch 'master' into dnssec
src/cache.c
src/config.h
src/dnsmasq.c
src/dnsmasq.h
src/forward.c
src/option.c