]> 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: 079a957 07a36b2)
Merge branch '1.0.0'
authorMarek Vavrusa <marek@vavrusa.com>
Tue, 29 Mar 2016 05:09:34 +0000 (22:09 -0700)
committerMarek Vavrusa <marek@vavrusa.com>
Tue, 29 Mar 2016 05:09:34 +0000 (22:09 -0700)
1  2 
daemon/README.rst patch | diff1 | diff2 | blob | history
daemon/daemon.mk patch | diff1 | diff2 | blob | history

diff --cc daemon/README.rst
Simple merge
diff --cc daemon/daemon.mk
Simple merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git