Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment