Merge github/master into mavenize

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

Merge github/master into mavenize
Conflicts: com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelRunner.java
fe58259a · Patrick Sharp · 208675fa · 5ab557ad · fe58259a
Commit fe58259a authored 8 years ago by Patrick Sharp
--- a/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelRunner.java
+++ b/com.amd.aparapi/src/java/com/amd/aparapi/internal/kernel/KernelRunner.java