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

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

Conflicts:
	test/test_gpuarray.py
parents 3d51a220 f408e3a0
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