]> git.ipfire.org Git - people/arne_f/ipfire-2.x.git/commitdiff
projects / people / arne_f / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 697b4f0 508288a)
Merge remote-tracking branch 'mfischer/dnsmasq' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 Jun 2015 11:12:33 +0000 (13:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 Jun 2015 11:12:33 +0000 (13:12 +0200)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Conflicts:
lfs/dnsmasq

1  2 
src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch patch | diff1 | diff2 | blob | history
src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch patch | diff1 | diff2 | blob | history

Arne's tree of IPFire 2.x.