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

Merge branch 'master' into cffi 

Conflicts:
	pyopencl/__init__.py
parents 4ae4aa91 6e24507b
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