Integration branch for all IGT branches that will be part of the 2016-03 release.
Test everything here and merge it to the master afterwards.
Description
Description
Event Timeline
Comment Actions
[eabec7]: Merge branch 'bug-19611-IGT-Integration-2016-03-NEW'
Merged commits:
2016-03-16 13:45:20 Alfred Franz [545247]
disabled test which fails (see T19614 for detail)
2016-03-16 10:21:49 Alfred Franz [a4889c]
Merge branch 'bug-19611-IGT-Integration-2016-03' into bug-19611-IGT-Integration-2016-03-NEW
2016-03-15 22:14:20 Alfred Franz [f7ad02]
fixed merge problem
2016-03-15 21:44:43 Alfred Franz [431915]
Merge branch 'bug-17034-USImageLoggingFilterIntegration' into bug-19611-IGT-Integration-2016-03
- Conflicts:
- Modules/US/Testing/mitkUSImageLoggingFilterTest.cpp
2016-03-15 21:39:34 Alfred Franz [dbba6e]
Merge branch 'bug-17450-Integration-August2015' into bug-19611-IGT-Integration-2016-03
- Conflicts:
- Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp
- Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.h
2015-09-30 16:58:51 Alfred Franz [239799]
cleaned up
2015-09-30 16:58:08 Alfred Franz [f741dc]
finished implementation: bug is fixed now
2015-09-30 15:07:32 Alfred Franz [166e52]
Merge branch 'bug-17450-ToolPreviewUpdate' into bug-17450-Integration-August2015
Conflicts:
Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp
2015-04-21 17:56:39 Thomas Kilgus [66ebdc]
Tmp commit. Nothing working yet.
2015-04-21 16:20:37 Thomas Kilgus [77eee2]
Added Context member and listener to ToolTrackingStatusWidget.
2015-04-21 15:10:16 Thomas Kilgus [28dae7]
Format Commit.
2014-03-03 18:51:02 Adrian Winterstein [d97547]
Fixed compile errors on linux in USImageLoggingFilterTest.