Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
Loading
Showing with 813 additions and 462 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment