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.

e0b663c9

Commit e0b663c9 authored 13 years ago by Jan Kadlec

Downloads
- Plain Diff

Merge branches 'post-release' and 'code-review-merge-squash' into development

Conflicts:
	src/zcompile/zcompile.c

parents 4f8c21c6 338296f7

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

libknot/common.h 1 addition, 0 deletions

libknot/common.h
libknot/dname.c 3 additions, 0 deletions

libknot/dname.c
libknot/util/utils.c 14 additions, 0 deletions

libknot/util/utils.c
libknot/util/utils.h 10 additions, 0 deletions

libknot/util/utils.h
samples/example.com.zone 0 additions, 1 deletion

samples/example.com.zone
src/common/slab/slab.c 4 additions, 1 deletion

src/common/slab/slab.c
src/knot/zone/zone-dump-text.c 14 additions, 11 deletions

src/knot/zone/zone-dump-text.c
src/knot/zone/zone-dump.c 158 additions, 67 deletions

src/knot/zone/zone-dump.c
src/zcompile/zcompile.c 232 additions, 36 deletions

src/zcompile/zcompile.c
src/zcompile/zcompile.h 2 additions, 0 deletions

src/zcompile/zcompile.h
src/zcompile/zlexer.l 8 additions, 2 deletions

src/zcompile/zlexer.l
src/zcompile/zparser.y 224 additions, 89 deletions

src/zcompile/zparser.y

with 670 additions and 207 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