]> git.ipfire.org Git - people/ms/dnsmasq.git/commit
Merge branch 'master' into dnssec
authorSimon Kelley <simon@thekelleys.org.uk>
Thu, 14 Nov 2013 10:39:40 +0000 (10:39 +0000)
committerSimon Kelley <simon@thekelleys.org.uk>
Thu, 14 Nov 2013 10:39:40 +0000 (10:39 +0000)
commit06e54b823e75c121fcd49c75b7382593c3f2f418
tree0e48cc8a0548b64af5eb2425d4036a026c1a6d95
parent5a4120dbfb2b44a55b5327daf7b3157a12416df7
parent32b4e4cb7c48638c62dc0865dbf86e584e620a6b
Merge branch 'master' into dnssec
src/cache.c
src/config.h
src/dnsmasq.c
src/dnsmasq.h
src/option.c
src/rfc1035.c