Commit a6759d89 authored by Joseph Noir's avatar Joseph Noir

Merge branch 'topic/opencl' of github.com:Neverlord/libcppa into topic/opencl

Conflicts:
	cppa/opencl/actor_facade.hpp
parents 919fa7f0 32247f61
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