Skip to content
Snippets Groups Projects
Commit 9c0f7ce6 authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Merge remote-tracking branch 'origin/devel' into devel

# Conflicts:
#	.gitignore
parents 55ef9009 eacbbbc5
No related branches found
No related tags found
1 merge request!35After cmake and const refactor
Showing
No files found.
with 0 additions and 0 deletions
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