HomePhabricator
Diffusion MITK 4ef39dd4317a

Merge branch 'bug-8431-PortVideoPlayer'
4ef39dd4317a
Actions

Description

Merge branch 'bug-8431-PortVideoPlayer'

Conflicts:
Modules/Bundles/CMakeLists.txt
Modules/Bundles/PluginList.cmake

Details

Provenance
Diana Wald <d.wald@dkfz-heidelberg.de>Authored on Aug 10 2011, 3:22 PM
Parents
rMITKcf4101faf068: removed unnecessary QObject inheritance in PythonVariableStack. Enabled…
rMITK472672f699c7: Merge branch 'bug-8431-PortPointSetInteractionToCTK'
Branches
Unknown
Tags
Unknown

Event Timeline

Diana Wald <d.wald@dkfz-heidelberg.de> committed rMITK4ef39dd4317a: Merge branch 'bug-8431-PortVideoPlayer' (authored by Diana Wald <d.wald@dkfz-heidelberg.de>).Aug 10 2011, 3:22 PM

Merged Changes

Changes (27)

PathSize
Modules/
Bundles/
org.mitk.gui.qt.python.console/
src/
internal/
org.mitk.gui.qt.python.console/
org.mitk.gui.qt.moviemaker/
org.mitk.gui.qt.python.console/
src/
internal/
org.mitk.gui.qt.pointsetinteraction/
src/
internal/
org.mitk.gui.qt.videoplayer/
src/
internal/
org.mitk.gui.qt.videoplayer/
org.mitk.gui.qt.rigidregistration/
org.mitk.gui.qt.videoplayer/
src/
internal/
org.mitk.gui.qt.pointsetinteraction/
src/
internal/

rMITK4ef39dd4317a

View Options

Modules/Bundles/CMakeLists.txt

Loading...
View Options

Modules/Bundles/PluginList.cmake

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/CMakeLists.txt

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/META-INF

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/META-INF/MANIFEST.MF

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/files.cmake

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/manifest.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/manifest_headers.cmake

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/plugin.xml

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/src/ConsoleDll.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistory.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonConsoleView.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonEditor.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonPerspective.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStack.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/mitkPluginActivator.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/mitkPluginActivator.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.videoplayer/CMakeLists.txt

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.videoplayer/META-INF

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.videoplayer/META-INF/MANIFEST.MF

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.videoplayer/files.cmake

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.videoplayer/manifest.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.videoplayer/manifest_headers.cmake

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.videoplayer/src/VideoPlayerDll.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.videoplayer/src/internal/QmitkVideoPlayer.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.videoplayer/src/internal/mitkPluginActivator.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.videoplayer/src/internal/mitkPluginActivator.h

Loading...
MITK · MIC · IMSY · DKFZ