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

Merge branch 'master' of t:src/pyopencl 

Conflicts:
	test/test_clmath.py
parents 045c1bbe e44d00da
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