Skip to content
Snippets Groups Projects
Commit 7237dacb authored by Alexandr Mruchok's avatar Alexandr Mruchok
Browse files

Merge branch 'master' into feature-2648 

# Conflicts:
#	CMakeLists.txt
#	sources/main.c
parents b732fe8f 5cb4e545
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 20 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