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

Merge branch 'reduction' of git://localhost/pycuda 

Conflicts:
	doc/source/array.rst
	pycuda/gpuarray.py
	pycuda/reduction.py
parents 86e59e41 ad38b465
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment