]> 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: 9f25542 57d5b1f)
Merge branch '1.2-keep-autogenerated-protobuf-c' into '1.2'
authorOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 12:40:21 +0000 (14:40 +0200)
committerOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 12:40:21 +0000 (14:40 +0200)
1.2 keep autogenerated protobuf c

See merge request !264


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