Merge remote-tracking branch 'origin/bug-19385-VideoPlayerViewCrashes' into bug-19385-VideoPlayerViewCrashes-Integration
Conflicts:
Modules/OpenCVVideoSupport/UI/QmitkOpenCVVideoControls.cpp
Merge remote-tracking branch 'origin/bug-19385-VideoPlayerViewCrashes' into… Tags None Referenced Files None Subscribers None
Description
Details
Merged Changes |