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

Merge branch 'master' into bryan. Clean up Bryan's patch. 

Conflicts:
	pycuda/compiler.py
parents 83ba3f32 1177201f
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