]> 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: 9578293 1bb9ec0)
Merge branch 'resolve-split-api'
authorMarek Vavruša <marek.vavrusa@nic.cz>
Mon, 27 Apr 2015 17:02:37 +0000 (19:02 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Mon, 27 Apr 2015 17:02:37 +0000 (19:02 +0200)

Trivial merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git