Merge remote-tracking branch 'origin/master' into bug-16744-integration-master
9f4cef68d6a1
Actions

Description

Merge remote-tracking branch 'origin/master' into bug-16744-integration-master

Conflicts:
Core/Code/Common/mitkTestingMacros.h
Core/Code/Testing/CMakeLists.txt
Core/Code/Testing/DCMTesting/mitkTestDCMLoading.cpp
Core/Code/Testing/mitkDicomSeriesReaderTest.cpp
Examples/CMakeLists.txt
Modules/CMakeLists.txt
Modules/DICOMTesting/CMakeLists.txt
Modules/ImageStatistics/Testing/mitkImageStatisticsCalculatorTest.cpp

Details

Provenance

maleike

Authored on Jan 22 2014, 4:46 PM

Parents

rMITK0822f83ae687: Fix copy c'tors and operator= (Markus' review)
rMITKc092df0df214: Merge branch 'bug-16869-test-labels-not-available'

Branches

Unknown

Tags

Unknown

Event Timeline

maleike committed rMITK9f4cef68d6a1: Merge remote-tracking branch 'origin/master' into bug-16744-integration-master (authored by maleike).Jan 22 2014, 4:46 PM

Merged Changes

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

c092df0df214 Merge branch 'bug-16869-test-labels-not-available'
Author
zelzer
Browse Repository
No Builds
No Audits
07a835b9c18c Set MODULE_SUBPROJECTS in the parent scope.
Author
zelzer
Browse Repository
No Builds
No Audits
0e013b3aa10f Merge branch 'bug-16865-mitk-package-version-file'
Author
zelzer
Browse Repository
No Builds
No Audits
7af1843d933c Use CMake 2.8.7 variant for writing package version information.
Author
zelzer
Browse Repository
No Builds
No Audits
16ff48efbc54 Merge branch 'bug-16874-CppMicroServices-usResouceCompiler-not-found'
Author
zelzer
Browse Repository
No Builds
No Audits
e980518f0117 Merge commit '8dccb25c1f2e267655fe955974ce285b38e89164' into bug-16874…
Author
zelzer
Browse Repository
No Builds
No Audits
8dccb25c1f2e Squashed 'Core/CppMicroServices/' changes from acdf3de..13080ed
Author
zelzer
Browse Repository
No Builds
No Audits
520f7ae4943d Merge branch 'bug-16873-FixConfigureWithoutBoost'
Author
franza
Browse Repository
No Builds
No Audits
2bb7bbf943ce Merge branch 'bug-8388-RemovePic2VtkDependency'
Author
• kolbs
Browse Repository
No Builds
No Audits
622dbbfc089d Fixed the cmakelist file: it is now checking if target ${TESTDRIVER} exists.
Author
franza
Browse Repository
No Builds
No Audits
4fb9dd4977b6 module dependency was already removed. deleted commented code that used the…
Author
• kolbs
Browse Repository
No Builds
No Audits
0cf4cdfd9630 Merge branch 'bug-15377-VolumerenderingGuiIsActiveAfterClosingProject'
Author
• knorr
Browse Repository
No Builds
No Audits
922b850ae789 Merge branch 'bug-15507-RemoveLastDeprecatedWorldCoordinatePixelAccess'
Author
• goerres
Browse Repository
No Builds
No Audits
492fae776e4b Merge branch 'bug-16870-FiberfoxParametersHeaderRemove'
Author
neher
Browse Repository
No Builds
No Audits
2f3e917251c9 removed include
Author
neher
Browse Repository
No Builds
No Audits
a1f8b4be6be6 Merge branch 'bug-16867-ArtifactsToDwiFix'
Author
neher
Browse Repository
No Builds
No Audits
3958795307e3 using parameter objetct for k-space image filter
Author
neher
Browse Repository
No Builds
No Audits
f35197f2ac80 Merge branch 'bug-16845-RefactorFiberfox'
Author
neher
Browse Repository
No Builds
No Audits
772ee4e83c5d Merge branch 'bug-16780-RemoveWarningsInDiffusionImaging'
Author
• goch
Browse Repository
No Builds
No Audits
8dbd84b9e731 Merge branch 'bug-16864-correct-project-target-name'
Author
• goch
Browse Repository
No Builds
No Audits
73ec1718534e COMP: Merge branch 'bug-16865-mitk-package-version-file'
Author
zelzer
Browse Repository
No Builds
No Audits
d7c28071dd1d Create a basic package version file for MITK.
Author
zelzer
Browse Repository
No Builds
No Audits
01c8d36ab62d use correct project name
Author
• goch
Browse Repository
No Builds
No Audits
5a5cb5bdc496 updated and complemented user manual
Author
neher
Browse Repository
No Builds
No Audits
4d24cfad4642 COMP Remove WSignCompare errors in Quantification
Author
• hering
Browse Repository
No Builds
No Audits
4baaa0e3e838 COMP: ignore unused variable warnings in connectomics due to boost
Author
• goch
Browse Repository
No Builds
No Audits
4b4003dc4c59 updated and extended documentation
Author
neher
Browse Repository
No Builds
No Audits
24c508ae275d COMP: More integer replacements
Author
• goch
Browse Repository
No Builds
No Audits
16028d9cb31f COMP: Another unsigned int int comparison
Author
• goch
Browse Repository
No Builds
No Audits
bf6347bdfbd1 COMP: Fixed size type
Author
• goch
Browse Repository
No Builds
No Audits
4936cc5c6939 COMP: Remove more linux warnings
Author
• goch
Browse Repository
No Builds
No Audits
72281fb0bfe1 refactored fiberfox. using parameter objects now. many small changes.
Author
neher
Browse Repository
No Builds
No Audits
271eb27d6c28 Merge branch 'bug-16809-package-dependencies-with-components'
Author
zelzer
Browse Repository
No Builds
No Audits
3979fe032e2b COMP: Add accidentally removed compile definitions again.
Author
zelzer
Browse Repository
No Builds
No Audits
bddca14d5dfe Merge branch 'bug-16809-package-dependencies-with-components'
Author
zelzer
Browse Repository
No Builds
No Audits
165ba10ed323 COMP: Link vtkRenderingFreeTypeOpenGL to Mitk
Author
zelzer
Browse Repository
No Builds
No Audits
26fc021dbc24 Merge branch 'bug-16809-package-dependencies-with-components'
Author
zelzer
Browse Repository
No Builds
No Audits
250fbcf7f5d9 COMP: fixes missed syntax changes in component specifications.
Author
zelzer
Browse Repository
No Builds
No Audits
c768b4a9529c Merge branch 'bug-16809-package-dependencies-with-components'
Author
zelzer
Browse Repository
No Builds
No Audits
d41d565dcfc4 There is no ITK_GDCM_DIR variable any more.
Author
zelzer
Browse Repository
No Builds
No Audits
d70094114d12 Fixed component syntax for package dependencies.
Author
zelzer
Browse Repository
No Builds
No Audits
962e9d4f4fbc Merge branch 'bug-16780-RepairProjectionFilter'
Author
• kolbch
Browse Repository
No Builds
No Audits
b511af855332 COMP: initialize radius_src
Author
• kolbch
Browse Repository
No Builds
No Audits
d1806f914fc6 Merge branch 'bug-16780-RepairProjectionFilter'
Author
• kolbch
Browse Repository
No Builds
No Audits
3882692ab8ce COMP: initialize radius_src
Author
• kolbch
Browse Repository
No Builds
No Audits
39d3e16f21b8 Merge branch 'bug-16780-RepairProjectionFilter'
Author
• kolbch
Browse Repository
No Builds
No Audits
7104b493d9fe COMP: use signed integers in for loop
Author
• kolbch
Browse Repository
No Builds
No Audits
2506fad0b54d Merge branch 'bug-16780-warnings-unused-result'
Author
• webechr
Browse Repository
No Builds
No Audits
fb58694cae52 COMP: fix to remove unused result errors.
Author
• webechr
Browse Repository
No Builds
No Audits
41e8e9a1efdd Merge branch 'bug-16780-RemoveWarningsInDiffusionImaging'
Author
• kolbch
Browse Repository
No Builds
No Audits

Very Large Commit

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

Merge remote-tracking branch 'origin/master' into bug-16744-integration-master9f4cef68d6a1Actions

Description

Details

Event Timeline

Merged Changes

Very Large Commit

Merge remote-tracking branch 'origin/master' into bug-16744-integration-master
9f4cef68d6a1
Actions