Skip to content
Snippets Groups Projects
Commit 526d3153 authored by Daniel Salzman's avatar Daniel Salzman
Browse files

Merge branch 'master' into branch-1.4prep

Conflicts:
	Knot.files
	src/Makefile.am
parents 1bd6f345 8cc0fd8c
Branches
Tags
No related merge requests found
Showing with 285 additions and 93 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment