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

Merge branch 'master' of slate:src/pyopencl 

Conflicts:
	test/test_array.py
parents a55d77c1 9bc024ca
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