Skip to content
Snippets Groups Projects
Commit 7fba6611 authored by bigbes's avatar bigbes
Browse files

Merge branch 'stable' 

Conflicts:
	.gitignore
	extra/CMakeLists.txt
	test/CMakeLists.txt
parents 35af5d32 9d1039e9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1004 additions and 16 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