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

Merge branch 'master' of tuck.ath.cx:src/pyopencl 

Conflicts:
	doc/source/misc.rst
	pyopencl/version.py
parents dfa31dbb a3435606
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