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

Merge branch 'master' into 'concurrency-check' 

# Conflicts:
#   pyopencl/invoker.py
#   test/test_wrapper.py
parents 34a6acc0 392a9177
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