]> 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: 797a6c4 c23edd0)
Merge branch 'tcp-ooo'
authorMarek Vavrusa <marek@vavrusa.com>
Wed, 4 May 2016 00:46:56 +0000 (17:46 -0700)
committerMarek Vavrusa <marek@vavrusa.com>
Wed, 4 May 2016 00:46:56 +0000 (17:46 -0700)

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