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

Merge branch 'gh' into 'master' 

Merge github master

See merge request inducer/pyopencl!82
parents c92d1047 447d74e5
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