]> git.ipfire.org Git - people/ms/dnsmasq.git/commit
Fix merge error
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 1 Feb 2015 23:21:51 +0000 (00:21 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 4 Feb 2016 23:37:54 +0000 (23:37 +0000)
commit1f7c4af762acd4a158ce4dfafead46817e55ec3f
tree77918d943c27064ea3660ac8eed3f9371916b7cb
parented3747d52ae5cdea8ed0af42046c03a50065d8c2
Fix merge error
src/dnsmasq.h