mitk
991aaccc5627
Actions

Description

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

Details

Provenance

hentsch	Authored on Dec 8 2017, 10:04 AM
hentsch	Pushed on Dec 8 2017, 10:04 AM

Parents

rMITKf05cd7b67a85: Merge branch 'T23856-QmitkChartWidgetCustomColors'
rMITK027faedcbf3e: Merge branch 'T23810-MitkDICOMQIIO-crash'

Branches

Unknown

Tags

Unknown

Event Timeline

hentsch committed rMITK991aaccc5627: Merge branch 'master' of https://phabricator.mitk.org/diffusion/MITK/mitk (authored by hentsch).Dec 8 2017, 10:04 AM

Merged Changes

027faedcbf3e Merge branch 'T23810-MitkDICOMQIIO-crash'
Author
• goch
Browse Repository
No Builds
No Audits
538586b718e7 Merge branch 'T23914-Python'
Author
neher
Browse Repository
No Builds
No Audits
c381ea095616 Disapling MITK Diffusion if MITK is built without python
Author
neher
Browse Repository
No Builds
No Audits
927227249081 Merge branch 'T23914-Python'
Author
neher
Browse Repository
No Builds
No Audits
27c6987c24f2 Check for python
Author
neher
Browse Repository
No Builds
No Audits
8dcbdf68d028 Give warning instead of crashing
Author
• goch
Browse Repository
No Builds
No Audits
0fcc8bcc8b0e Merge branch 'T23901-RemovePluginGeneratorUpdateCheck'
Author
kislinsk
Browse Repository
No Builds
No Audits
61a4f885b4a6 Add dependency to Qt5 Core
Author
kislinsk
Browse Repository
No Builds
No Audits
af27b49580d0 Move and rename classes for cleanupx
Author
• goch
Browse Repository
No Builds
No Audits

Changes (27)

Path

Size

Packages

Applications/

Diffusion/

CMakeLists.txt

PluginGenerator/

CMakeLists.txt

CMake/

BuildConfigurations/

DiffusionAll.cmake

O1: MITK Reviewer Group I

DiffusionRelease.cmake

O1: MITK Reviewer Group I

Modules/

DICOMQI

O3: MITK Reviewer Group II

CMakeLists.txt

O3: MITK Reviewer Group II

autoload

O3: MITK Reviewer Group II

CMakeLists.txt

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

mitkDICOMQIActivator.cpp

O3: MITK Reviewer Group II

mitkDICOMQIIOMimeTypes.cpp

O3: MITK Reviewer Group II

mitkDICOMQIIOMimeTypes.h

O3: MITK Reviewer Group II

mitkDICOMSegmentationIO.cpp

O3: MITK Reviewer Group II

mitkDICOMSegmentationIO.h

O3: MITK Reviewer Group II

DICOMReader/

src/

mitkDICOMIOHelper.cpp

ModuleList.cmake

Multilabel/

CMakeLists.txt

O1: MITK Reviewer Group I

autoload/

DICOMQIIO

O1: MITK Reviewer Group I

	Multilabel/	autoload/	DICOMQIIO/
	DICOMQI/	autoload/	IO/

CMakeLists.txt

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

	mitkDICOMQIIOActivator.cpp
	mitkDICOMQIActivator.cpp

O1: MITK Reviewer Group I

mitkDICOMQIIOMimeTypes.cpp

O1: MITK Reviewer Group I

mitkDICOMQIIOMimeTypes.h

O1: MITK Reviewer Group I

mitkDICOMSegmentationIO.cpp

O1: MITK Reviewer Group I

mitkDICOMSegmentationIO.h

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.diffusionimaging.preprocessing/

CMakeLists.txt

rMITK991aaccc5627

View Options

Applications/Diffusion/CMakeLists.txt

View Options

Applications/PluginGenerator/CMakeLists.txt

View Options

CMake/BuildConfigurations/DiffusionAll.cmake

View Options

CMake/BuildConfigurations/DiffusionRelease.cmake

View Options

Modules/DICOMQI

View Options

Modules/DICOMQI/CMakeLists.txt

View Options

Modules/DICOMQI/autoload

View Options

Modules/DICOMQI/autoload/IO

View Options

Modules/DICOMQI/autoload/IO/CMakeLists.txt

View Options

Modules/DICOMQI/autoload/IO/files.cmake

View Options

Modules/DICOMQI/autoload/IO/mitkDICOMQIActivator.cpp

View Options

Modules/DICOMQI/autoload/IO/mitkDICOMQIIOMimeTypes.cpp

View Options

Modules/DICOMQI/autoload/IO/mitkDICOMQIIOMimeTypes.h

View Options

Modules/DICOMQI/autoload/IO/mitkDICOMSegmentationIO.cpp

View Options

Modules/DICOMQI/autoload/IO/mitkDICOMSegmentationIO.h

View Options

Modules/DICOMReader/src/mitkDICOMIOHelper.cpp

View Options

Modules/ModuleList.cmake

View Options

Modules/Multilabel/CMakeLists.txt

View Options

Modules/Multilabel/autoload/DICOMQIIO/CMakeLists.txt

View Options

Modules/Multilabel/autoload/DICOMQIIO/files.cmake

View Options

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMQIIOActivator.cpp

View Options

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMQIIOMimeTypes.cpp

View Options

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMQIIOMimeTypes.h

View Options

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMSegmentationIO.cpp

View Options

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMSegmentationIO.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/CMakeLists.txt

Merge branch 'master' of https://phabricator.mitk.org/diffusion/MITK/mitk991aaccc5627Actions

Description

Details

Event Timeline

Merged Changes

Changes (27)

rMITK991aaccc5627

Applications/Diffusion/CMakeLists.txt

Applications/PluginGenerator/CMakeLists.txt

CMake/BuildConfigurations/DiffusionAll.cmake

CMake/BuildConfigurations/DiffusionRelease.cmake

Modules/DICOMQI

Modules/DICOMQI/CMakeLists.txt

Modules/DICOMQI/autoload

Modules/DICOMQI/autoload/IO

Modules/DICOMQI/autoload/IO/CMakeLists.txt

Modules/DICOMQI/autoload/IO/files.cmake

Modules/DICOMQI/autoload/IO/mitkDICOMQIActivator.cpp

Modules/DICOMQI/autoload/IO/mitkDICOMQIIOMimeTypes.cpp

Modules/DICOMQI/autoload/IO/mitkDICOMQIIOMimeTypes.h

Modules/DICOMQI/autoload/IO/mitkDICOMSegmentationIO.cpp

Modules/DICOMQI/autoload/IO/mitkDICOMSegmentationIO.h

Modules/DICOMReader/src/mitkDICOMIOHelper.cpp

Modules/ModuleList.cmake

Modules/Multilabel/CMakeLists.txt

Modules/Multilabel/autoload/DICOMQIIO/CMakeLists.txt

Modules/Multilabel/autoload/DICOMQIIO/files.cmake

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMQIIOActivator.cpp

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMQIIOMimeTypes.cpp

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMQIIOMimeTypes.h

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMSegmentationIO.cpp

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMSegmentationIO.h

Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/CMakeLists.txt

Merge branch 'master' of https://phabricator.mitk.org/diffusion/MITK/mitk
991aaccc5627
Actions