Skip to content
Snippets Groups Projects
Commit 71899eac authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'master' into cffi 

Conflicts:
	src/wrapper/wrap_cl.hpp
parents eaecee21 7b512fec
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
compyte @ 2293b43e
Compare c5e80622...2293b43e
Subproject commit c5e80622ee2dfd129d56886098a5ad532c54cf09 Subproject commit 2293b43ecfadfd4ea2adc9266c8ec18f2ae0ce11
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