Diffusion MITK 3e745cea8473

Merge branch 'bug-17719-IntegrationBranch'
3e745cea8473
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-17719-IntegrationBranch'

Details

Provenance

Authored on Apr 16 2014, 4:02 PM

Parents

rMITK2197fc2043a2: fixed problem caused by the merge
rMITK0ed1b32c2ed2: Merge branch 'bug-17551-exampleplugincrash'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK3e745cea8473: Merge branch 'bug-17719-IntegrationBranch' (authored by franza).Apr 16 2014, 4:02 PM

Merged Changes

2197fc2043a2 fixed problem caused by the merge
Author
franza
Browse Repository
No Builds
No Audits
ae8f6bc4cdaf Merge branch 'bug-17719-CrashQuickFix'
Author
franza
Browse Repository
No Builds
No Audits
4823a5a67101 added quick fix for crash based on release branch
Author
franza
Browse Repository
No Builds
No Audits
eb025ddf02d2 MITK 2014.03.00 version update
Author
• fetzer
Browse Repository
No Builds
No Audits
7c10d7be1b81 Merge branch 'bug-17693-ModuleNameOfUSHardwareTelemedDoesNotMatchTheNewNamingCo…
Author
• fetzer
Browse Repository
No Builds
No Audits
89c23e02c80c Merge branch 'bug-17704-ClippingPlaneButtonsDeselection' into releases/2014-03
Author
• fetzer
Browse Repository
No Builds
No Audits
88303e6af310 Fixed visibility of the contours. Reason was probably that the layer was not…
Author
• fetzer
Browse Repository
No Builds
No Audits
d59a054d3c2f Merge branch 'bug-17704-ClippingPlaneButtonsDeselection' into releases/2014-03
Author
• metzger
Browse Repository
No Builds
No Audits

Changes (3)

Path

Size

Applications/

PluginGenerator/

ProjectTemplate/

CMakeExternals/

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

rMITK3e745cea8473

Applications/PluginGenerator/ProjectTemplate/CMakeExternals/MITK.cmake

Loading...

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Loading...

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.h

Loading...