HomePhabricator
Diffusion MITK e518d88c31cc

Merge branch 'mitk-2012.12.0' into niftk
e518d88c31ccUnpublished

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge branch 'mitk-2012.12.0' into niftk

Conflicts:
CMake/mitkMacroInstall.cmake
Core/Code/Controllers/mitkRenderingManager.cpp
Core/Code/Interactions/mitkMouseModeSwitcher.cpp
Core/Code/Rendering/mitkPointSetGLMapper2D.cpp
Modules/Qmitk/QmitkDataStorageComboBox.h

Details

Provenance
clarksonAuthored on Dec 27 2012, 7:31 PM
kislinskPushed on Aug 6 2018, 4:04 PM
Parents
rMITKc4e1a21b92b1: Merge branch 'MITK-bug-13504-trac-1871-CTK-Designer-Plugins-Not-Resolved' into…
rMITKc9b8a272f3c2: MITK 2012.12.00 version update
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.