]> 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: 16b8f4e 1b93186)
Merge branch 'master' into cache-rrsig-wip
authorMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 17 Sep 2015 11:58:51 +0000 (13:58 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 17 Sep 2015 11:58:51 +0000 (13:58 +0200)
1  2 
daemon/main.c patch | diff1 | diff2 | blob | history
lib/resolve.c patch | diff1 | diff2 | blob | history
tests/unit.mk patch | diff1 | diff2 | blob | history

diff --cc daemon/main.c
Simple merge
diff --cc lib/resolve.c
Simple merge
diff --cc tests/unit.mk
Simple merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git