]> 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: a276175 52b92f4)
Merge branch 'dhcpv6'
authorSimon Kelley <simon@thekelleys.org.uk>
Sun, 22 Jan 2012 16:07:22 +0000 (16:07 +0000)
committerSimon Kelley <simon@thekelleys.org.uk>
Sun, 22 Jan 2012 16:07:22 +0000 (16:07 +0000)
1  2 
src/dnsmasq.c patch | diff1 | diff2 | blob | history

diff --cc src/dnsmasq.c
Simple merge
Michael's tree of dnsmasq.