Diffusion MITK 6106e89c55f1

Merge branch 'bug-15163-ConvertEventConfigMembersToStaticFunctions'
6106e89c55f1
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-15163-ConvertEventConfigMembersToStaticFunctions'

Conflicts:
CMake/mitkSetupVariables.cmake

Details

Provenance

Authored on Jun 6 2013, 10:34 AM

Parents

rMITKb5365a5ec672: Replaced members by static functions return const std::string
rMITK95fb2b9d8588: Merge branch 'bug-14821-improved-preloading-libraries-in-ctk'

Branches

Unknown

Tags

Unknown

Event Timeline

• webechr committed rMITK6106e89c55f1: Merge branch 'bug-15163-ConvertEventConfigMembersToStaticFunctions' (authored by • webechr).Jun 6 2013, 10:34 AM

Merged Changes

b5365a5ec672 Replaced members by static functions return const std::string
Author
• webechr
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
b11754c41092 Merge branch 'bug-14915-add-iostream-eventconfig-constructor' into…
Author
zelzer
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

Changes (6)

Path

Size

Core/

Code/

Interactions/

mitkEventConfig.cpp

mitkEventFactory.cpp

mitkInteractionEventConst.cpp

mitkInteractionEventConst.h

mitkStateMachineTransition.cpp

Testing/

mitkEventConfigTest.cpp

rMITK6106e89c55f1

Core/Code/Interactions/mitkEventConfig.cpp

Loading...

Core/Code/Interactions/mitkEventFactory.cpp

Loading...

Core/Code/Interactions/mitkInteractionEventConst.cpp

Loading...

Core/Code/Interactions/mitkInteractionEventConst.h

Loading...

Core/Code/Interactions/mitkStateMachineTransition.cpp

Loading...

Core/Code/Testing/mitkEventConfigTest.cpp

Loading...