]> git.ipfire.org Git - people/ms/dnsmasq.git/commitdiff
projects / people / ms / dnsmasq.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23facf0 46c89f2)
Merge branch 'master' of ssh://thekelleys.org.uk/var/cache/git/dnsmasq
authorSimon Kelley <simon@thekelleys.org.uk>
Tue, 26 May 2015 21:12:01 +0000 (22:12 +0100)
committerSimon Kelley <simon@thekelleys.org.uk>
Tue, 26 May 2015 21:12:01 +0000 (22:12 +0100)
1  2 
dnsmasq.conf.example patch | diff1 | diff2 | blob | history

diff --cc dnsmasq.conf.example
Simple merge
Michael's tree of dnsmasq.