Skip to content
Unverified Commit a50d57bc authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'master' into improve-include-consistency

# Conflicts:
#	src/utils.cpp
parents ceb2ce58 981b9a1f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment