Skip to content
Commit bfe9591d authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'master' into cffi 

Conflicts:
	.gitignore
	src/wrapper/wrap_cl.hpp
parents db4cd3c0 7240e31a
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