Merge commit '6b47e9ca1d18df4b1cd2c66e488ad91f9730ecdf' into v0.7.0

# Conflicts:
#	cmake/CMakeLists.txt
#	nix/build-all.py
#	test/input
This commit is contained in:
Thomas Krijnen
2019-01-22 13:00:49 +01:00
7 changed files with 511 additions and 20 deletions
+2
View File
@@ -12,3 +12,5 @@ __pycache__
.vscode
# PyCharm files
.idea
# OSX files
.DS_Store