Diffusion MITK 45992c080525

Merge branch 'master' of https://phabricator.mitk.org/source/mitk
45992c080525
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'master' of https://phabricator.mitk.org/source/mitk

Details

Provenance

• kirchnth	Authored on Sep 29 2017, 1:23 PM
• kirchnth	Pushed on Sep 29 2017, 1:22 PM

Parents

rMITKf2f0d820cfe9: Merge branch 'T23458-updateAboutWindow'
rMITK9cc80cc35f8c: Merge branch 'T20043-VideoPlayerIntegration'

Branches

Unknown

Tags

Unknown

Event Timeline

• kirchnth committed rMITK45992c080525: Merge branch 'master' of https://phabricator.mitk.org/source/mitk (authored by • kirchnth).Sep 29 2017, 1:23 PM

Merged Changes

9cc80cc35f8c Merge branch 'T20043-VideoPlayerIntegration'
Author
• groehl
Browse Repository
No Builds
No Audits
b07404df4899 add method to listen to value changes on VideoProgressSlider - then adjust…
Author
• groehl
Browse Repository
No Builds
No Audits
46438391e1e1 Merge branch 'T20043-VideoPlayer_ProgressSlider' into T20043…
Author
reinkea
Browse Repository
No Builds
No Audits
37847a61b05c fix VideoPlayer Progress slider
Author
reinkea
Browse Repository
No Builds
No Audits

Changes (3)

Path

Size

Modules/

OpenCVVideoSupport/

UI/

QmitkOpenCVVideoControls.cpp

QmitkOpenCVVideoControls.h

mitkOpenCVVideoSource.cpp

rMITK45992c080525

Modules/OpenCVVideoSupport/UI/QmitkOpenCVVideoControls.cpp

Loading...

Modules/OpenCVVideoSupport/UI/QmitkOpenCVVideoControls.h

Loading...

Modules/OpenCVVideoSupport/mitkOpenCVVideoSource.cpp

Loading...