Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Knot DNS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

Self sign-up has been disabled due to increased spam activity. If you want to get access, please send an email to a project owner (preferred) or at gitlab(at)nic(dot)cz. We apologize for the inconvenience.

52d518e5

Commit 52d518e5 authored 13 years ago by Jan Kadlec

Downloads
- Plain Diff

Merge remote branch 'origin/development' into code-review-merge-squash

parents 42b54570 98950829

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

libknot/packet/packet.c 3 additions, 3 deletions

libknot/packet/packet.c
src/knot/conf/cf-lex.l 1 addition, 1 deletion

src/knot/conf/cf-lex.l
src/knot/ctl/knotc_main.c 25 additions, 8 deletions

src/knot/ctl/knotc_main.c
src/knot/main.c 16 additions, 13 deletions

src/knot/main.c
src/knot/server/server.c 3 additions, 3 deletions

src/knot/server/server.c

with 48 additions and 28 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment