Skip to content
Snippets Groups Projects
Commit 1d5f9a1f authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge branch 'devel' into gauss

Conflicts:
	src/node.cpp
parents e9305ec2 b9677075
No related branches found
No related tags found
3 merge requests!11new release,!10new release,!4Gauss
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 to comment