Merge branch 'rrset' into rrset_owner_shared
Conflicts: src/libknot/dname.c
Showing
- src/knot/conf/cf-parse.y 1 addition, 1 deletionsrc/knot/conf/cf-parse.y
- src/knot/ctl/remote.c 1 addition, 1 deletionsrc/knot/ctl/remote.c
- src/libknot/dname.c 134 additions, 91 deletionssrc/libknot/dname.c
- src/libknot/dname.h 44 additions, 26 deletionssrc/libknot/dname.h
- src/tests/libknot/dname_tests.c 22 additions, 14 deletionssrc/tests/libknot/dname_tests.c
- src/utils/common/exec.h 1 addition, 1 deletionsrc/utils/common/exec.h
- src/utils/dig/dig_exec.c 2 additions, 2 deletionssrc/utils/dig/dig_exec.c
Please register or sign in to comment