]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
projects / thirdparty / knot-resolver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 172d041 70af460)
Merge branch 'master' into aho-corasick
authorVladimír Čunát <vladimir.cunat@nic.cz>
Mon, 31 Jul 2017 13:08:01 +0000 (15:08 +0200)
committerVladimír Čunát <vladimir.cunat@nic.cz>
Mon, 31 Jul 2017 13:08:01 +0000 (15:08 +0200)
1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git