Skip to content
Snippets Groups Projects
Commit 9e11c564 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'sdp'

Conflicts:

	src/managerimpl.cpp
parents c9765adb ff5d6c6d
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment