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

Merge branch 'pull.test-get_host_array' of github.com:yuyichao/pyopencl into test-get_host_array 

Conflicts:
	test/test_wrapper.py
parents 3a4f4d89 89c4af07
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