Merge branch 'master' into niftk
f70be82e0386Unpublished
Actions

Unpublished Commit · Learn More

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

Description

Merge branch 'master' into niftk

Details

Provenance

clarkson	Authored on May 2 2013, 12:04 PM
kislinsk	Pushed on Aug 6 2018, 4:04 PM

Parents

rMITKc4accfb73bb2: Merge commit 'a56031251d' from branch bug-15051-unregister-planarfigure…
rMITKc46b74d625c9: Merge branch 'master', version 48573155e7, for bug 14355, usResourceCompiler…

Branches

Unknown

Tags

Unknown

Event Timeline

clarkson committed rMITKf70be82e0386: Merge branch 'master' into niftk (authored by clarkson).May 2 2013, 12:04 PM

Merged Changes

c4accfb73bb2 Merge commit 'a56031251d' from branch bug-15051-unregister-planarfigure…
Author
clarkson
Browse Repository
No Builds
No Audits
f48fc8c87e32 Merge tag 'v2013.03.2'
Author
clarkson
Browse Repository
No Builds
No Audits
a56031251dc5 Properly unregister all object factories.
Author
zelzer
Browse Repository
No Builds
No Audits
4a983348b600 MITK 2013.03.02 version update
Author
zelzer
Browse Repository
No Builds
No Audits
0e56aeb69fbf Merge branch 'bug-14881-fix-opencl-context-creation' into releases/2013-03
Author
zelzer
Browse Repository
No Builds
No Audits
8ab33a957f97 Removing unused method
Author
• hering
Browse Repository
No Builds
No Audits
617bb17ce006 Packing all context-related stuff to a struct
Author
• hering
Browse Repository
No Builds
No Audits
c82aa5d060e0 Postponing OpenCL creation
Author
• hering
Browse Repository
No Builds
No Audits
0ad61f21fd13 Removed static member holding the OclServiceRef
Author
• hering
Browse Repository
No Builds
No Audits
b11754c41092 Merge branch 'bug-14915-add-iostream-eventconfig-constructor' into…
Author
zelzer
Browse Repository
No Builds
No Audits
d827286da853 Use the stack instead of expensive new.
Author
zelzer
Browse Repository
No Builds
No Audits
d30ce4e46b9d Changes to the construtor interface event config objects
Author
• webechr
Browse Repository
No Builds
No Audits
d609d80bae41 Added test execution to cmake Finalized doxygen description of mitkEventConfig
Author
• webechr
Browse Repository
No Builds
No Audits
915be4ddbe00 Deactivate legacy handling in ToolManager
Author
• webechr
Browse Repository
No Builds
No Audits
1b6b314657b5 Deactivate legacy handling in ToolManager
Author
• webechr
Browse Repository
No Builds
No Audits
4f40546bfae8 Finished Test. - working support for loading via ifstream - working support for…
Author
• webechr
Browse Repository
No Builds
No Audits
d23b866dff8d Adapted test - problem with ifstream conversion
Author
unknown <webechr@mbi025.inet.dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
26f969a133ef Re-enabled event-config test
Author
• webechr
Browse Repository
No Builds
No Audits
8974f7d32407 Provide interface for ifstream based config object creation, as well as for…
Author
• webechr
Browse Repository
No Builds
No Audits
d26c4e6a16a7 Merge remote-tracking branch 'origin/bug-14937-fix-compiler-flag-checks' into…
Author
zelzer
Browse Repository
No Builds
No Audits
a66c0f000fd3 Merge remote-tracking branch 'origin/bug-14355-fix-resource-compiler-path' into…
Author
zelzer
Browse Repository
No Builds
No Audits
0910f4af886f Merge remote-tracking branch 'origin/bug-14920-fix-git-repo-check' into…
Author
zelzer
Browse Repository
No Builds
No Audits
b2afbc7c8dc3 Merge remote-tracking branch 'origin/bug-14841-gpu-volumrendering-memory-leak'…
Author
zelzer
Browse Repository
No Builds
No Audits
bc5caa81a19a Renamed mitkFunctionCheckCompilerFlags2 to mitkFunctionCheckCAndCXXCompilerFlags
Author
zelzer
Browse Repository
No Builds
No Audits
3ac29da6fbdd Use custom CMake scripts for checking compiler flags.
Author
zelzer
Browse Repository
No Builds
No Audits

Changes (21)

Path

Size

Packages

CMake/

mitkCheckCCompilerFlag.cmake

O1: MITK Reviewer Group I

mitkCheckCXXCompilerFlag.cmake

O1: MITK Reviewer Group I

mitkFunctionCheckCompilerFlags.cmake

O1: MITK Reviewer Group I

mitkMacroCreateModule.cmake

O1: MITK Reviewer Group I

mitkSetupVariables.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Core/

Code/

Interactions/

mitkEventConfig.cpp

mitkEventConfig.h

mitkInteractionEventConst.h

Testing/

CMakeLists.txt

files.cmake

mitkEventConfigTest.cpp

Modules/

MitkExt/

Controllers/

mitkToolManager.cpp

mitkToolManager.h

OpenCL/

mitkOclResourceService.h

mitkOclResourceServiceImpl_Private.cpp

mitkOclResourceServiceImpl_p.h

PlanarFigure/

Algorithms/

mitkPlanarFigureObjectFactory.cpp

O1: MITK Reviewer Group I

mitkPlanarFigureObjectFactory.h

O1: MITK Reviewer Group I

IO/

mitkPlanarFigureWriterFactory.cpp

O1: MITK Reviewer Group I

mitkPlanarFigureWriterFactory.h

O1: MITK Reviewer Group I

rMITKf70be82e0386

View Options

CMake/mitkCheckCCompilerFlag.cmake

View Options

CMake/mitkCheckCXXCompilerFlag.cmake

View Options

CMake/mitkFunctionCheckCompilerFlags.cmake

View Options

CMake/mitkMacroCreateModule.cmake

View Options

CMake/mitkSetupVariables.cmake

View Options

CMakeLists.txt

View Options

Core/Code/Interactions/mitkEventConfig.cpp

View Options

Core/Code/Interactions/mitkEventConfig.h

View Options

Core/Code/Interactions/mitkInteractionEventConst.h

View Options

Core/Code/Testing/CMakeLists.txt

View Options

Core/Code/Testing/files.cmake

View Options

Core/Code/Testing/mitkEventConfigTest.cpp

View Options

Modules/MitkExt/Controllers/mitkToolManager.cpp

View Options

Modules/MitkExt/Controllers/mitkToolManager.h

View Options

Modules/OpenCL/mitkOclResourceService.h

View Options

Modules/OpenCL/mitkOclResourceServiceImpl_Private.cpp

View Options

Modules/OpenCL/mitkOclResourceServiceImpl_p.h

View Options

Modules/PlanarFigure/Algorithms/mitkPlanarFigureObjectFactory.cpp

View Options

Modules/PlanarFigure/Algorithms/mitkPlanarFigureObjectFactory.h

View Options

Modules/PlanarFigure/IO/mitkPlanarFigureWriterFactory.cpp

View Options

Modules/PlanarFigure/IO/mitkPlanarFigureWriterFactory.h

Merge branch 'master' into niftkf70be82e0386UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (21)

rMITKf70be82e0386

CMake/mitkCheckCCompilerFlag.cmake

CMake/mitkCheckCXXCompilerFlag.cmake

CMake/mitkFunctionCheckCompilerFlags.cmake

CMake/mitkMacroCreateModule.cmake

CMake/mitkSetupVariables.cmake

CMakeLists.txt

Core/Code/Interactions/mitkEventConfig.cpp

Core/Code/Interactions/mitkEventConfig.h

Core/Code/Interactions/mitkInteractionEventConst.h

Core/Code/Testing/CMakeLists.txt

Core/Code/Testing/files.cmake

Core/Code/Testing/mitkEventConfigTest.cpp

Modules/MitkExt/Controllers/mitkToolManager.cpp

Modules/MitkExt/Controllers/mitkToolManager.h

Modules/OpenCL/mitkOclResourceService.h

Modules/OpenCL/mitkOclResourceServiceImpl_Private.cpp

Modules/OpenCL/mitkOclResourceServiceImpl_p.h

Modules/PlanarFigure/Algorithms/mitkPlanarFigureObjectFactory.cpp

Modules/PlanarFigure/Algorithms/mitkPlanarFigureObjectFactory.h

Modules/PlanarFigure/IO/mitkPlanarFigureWriterFactory.cpp

Modules/PlanarFigure/IO/mitkPlanarFigureWriterFactory.h

Merge branch 'master' into niftk
f70be82e0386Unpublished
Actions