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

Merge branch 'master' into curand-wrapper-v2-from-tomasz 

Conflicts:
	doc/source/misc.rst
	pycuda/curandom.py
	setup.py
parents 4881e464 bcab281d
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