Merge branch 'bug-16236-hotspot-search-testdefinition' into bug-16236-hotspot…
18d6d4c63e8b
Actions

Description

Merge branch 'bug-16236-hotspot-search-testdefinition' into bug-16236-hotspot-search-imagestatisticscalculator-integration-snapshot

Conflicts:
Modules/ImageStatistics/Testing/CMakeLists.txt
Modules/ImageStatistics/Testing/files.cmake
Modules/ImageStatistics/Testing/mitkImageStatisticsHotspotTest.cpp

Details

Provenance

maleike

Authored on Feb 7 2014, 2:36 PM

Parents

rMITKb02e627d1b6b: Merge branch 'bug-16236-hotspot-search-imagestatisticscalculator' into bug…
rMITK6dddedb74013: Fix test definition

Branches

Unknown

Tags

Unknown

Event Timeline

maleike committed rMITK18d6d4c63e8b: Merge branch 'bug-16236-hotspot-search-testdefinition' into bug-16236-hotspot… (authored by maleike).Feb 7 2014, 2:36 PM

Merged Changes

6dddedb74013 Fix test definition
Author
maleike
Browse Repository
No Builds
No Audits
82b5671a5f1a Generate test cases via CMake
Author
maleike
Browse Repository
No Builds
No Audits
bc1d4269ef3c Fix documentation in details
Author
maleike
Browse Repository
No Builds
No Audits
d58fda45acb9 Improve test structure and output a bit
Author
maleike
Browse Repository
No Builds
No Audits

Changes (4)

Path

Size

Packages

Modules/

ImageStatistics/

Testing/

CMakeLists.txt

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

mitkImageStatisticsHotspotTest.cpp

O1: MITK Reviewer Group I

itkMultiGaussianImageSource.h

O1: MITK Reviewer Group I

rMITK18d6d4c63e8b

View Options

Modules/ImageStatistics/Testing/CMakeLists.txt

View Options

Modules/ImageStatistics/Testing/files.cmake

View Options

Modules/ImageStatistics/Testing/mitkImageStatisticsHotspotTest.cpp

View Options

Modules/ImageStatistics/itkMultiGaussianImageSource.h

Merge branch 'bug-16236-hotspot-search-testdefinition' into bug-16236-hotspot…18d6d4c63e8bActions

Description

Details

Event Timeline

Merged Changes

Changes (4)

rMITK18d6d4c63e8b

Modules/ImageStatistics/Testing/CMakeLists.txt

Modules/ImageStatistics/Testing/files.cmake

Modules/ImageStatistics/Testing/mitkImageStatisticsHotspotTest.cpp

Modules/ImageStatistics/itkMultiGaussianImageSource.h

Merge branch 'bug-16236-hotspot-search-testdefinition' into bug-16236-hotspot…
18d6d4c63e8b
Actions