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

Merge branch 'master' of t:src/pyopencl 

Conflicts:
	pyopencl/compyte
	pyopencl/reduction.py
parents f6ef2e3b 221a3bca
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