]> 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: 2bb6f77 aaeea9f)
Merge branch 'loop'
authorSimon Kelley <simon@thekelleys.org.uk>
Tue, 12 Aug 2014 17:41:24 +0000 (18:41 +0100)
committerSimon Kelley <simon@thekelleys.org.uk>
Tue, 12 Aug 2014 17:41:24 +0000 (18:41 +0100)
1  2 
src/dbus.c patch | diff1 | diff2 | blob | history

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