Skip to content
Commit a1f0a54b authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch 'master' into effectstack 

Conflicts:
	src/CMakeLists.txt
parents ff74d33c 7cd7234f
Expand all Hide whitespace changes
Inline Side-by-side
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