Commit 49d20c8c authored by Max Lyon's avatar Max Lyon
Browse files

Merge branch 'master' into CMakeSimplification

# Conflicts:
#	OpenFlipper
parents d09751f3 f6df1e0c