Commit 7fbf1851 authored by Dominik Charousset's avatar Dominik Charousset

Merge branch 'master' into unstable

Conflicts:
	cppa/scheduled_actor.hpp
parents 780764a4 92781661
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