Merge branch 'master' into niftk
Conflicts:
Core/Code/Interactions/mitkMouseModeSwitcher.cpp
Core/Code/Rendering/mitkImageVtkMapper2D.cpp
Unpublished Commit · Learn More
Not On Permanent Ref: This commit is not an ancestor of any permanent ref.
Description
Description
Details
Details
- Provenance
clarkson Authored on Feb 22 2013, 9:19 AM kislinsk Pushed on Aug 6 2018, 4:04 PM - Parents
- rMITKe4e8dbec92a1: Simplify gp_resolve_item_override for blueberry_osgi
rMITKf6e6cdea71a5: Merge branch 'bug-14512-SOFASurfaceRecording' - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- 0dedab245258 Finished surface recording.Author
- a3a9d3b496a9 Adjustments madeAuthor
- 419cabaf9520 Tooltipping adjustments made.Author
- 2a3a181dd047 fix precompiler instructionAuthor
- 88f30e614f56 Removed debug messageAuthor
- 279190dd2fd3 COMP: Fixed linux warning.Author
- d9c823cceebf included extraction methodAuthor
Very Large Commit
This commit is very large, and affects more than 1000 files. Changes are not shown.