Skip to content
Snippets Groups Projects
Commit c0a64ed5 authored by Cédric Roux's avatar Cédric Roux
Browse files

Merge remote-tracking branch 'origin/develop' 

New version 0.6.1.

Mostly bugfixes.

Conflicts:
	cmake_targets/tools/build_helper
parents 45212d3b 61234aae
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 588 additions and 147 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