Commit 8d5af278 authored by Patrick Sharp's avatar Patrick Sharp

Merge github/master into mavenize

Conflicts:
	com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelRunner.java

file moved to com.amd.aparapi/src/main/java/com/amd/aparapi/internal/kernel/KernelRunner.java
parent fe58259a
Markdown is supported
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