Merge branch 'master' into change-color-multi-selection-MASTER
Signed-off-by: Daniel Maleike <code@maleike.de>
Conflicts:
Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp
Description
Description
Details
Details
- Provenance
maleike Authored on Aug 30 2017, 12:55 PM • goch Pushed on Sep 18 2017, 4:35 PM - Parents
- rMITK95ef854a5f6e: Make Data Manager's color button multi-selection-enabled
rMITKfbd0f9ff217b: Merge branch 'T18922-FinalFixes' - 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.
- fbd0f9ff217b Merge branch 'T18922-FinalFixes'Author
- 12ec18a394d0 Remove QuickRender exampleAuthor
- e85a7c901292 Merge branch 'T18922-FinalFixes'Author
- 474fa3d7c410 Merge branch 'T18922-FinalFixes'Author
- 4bc3ffa922fa Merge branch 'T18922-FinalFixes'Author
- 013244d378ed Fix unused parametersAuthor
- a9f73e0d0408 Fix hidden base class methodAuthor
- ac20ff095a89 Fix unmatched */ comment endingsAuthor
- 1bc5e14397ff revert logo annotation widgetAuthor
- 151852e4ba05 Apply theme to view iconsAuthor
- 40b1243fbd9f Add parsable icon colorAuthor
- 43abde5ae579 added categoriesAuthor
- cb08f1d1c3af Merge branch 'T23279-noClip'Author
- 8ff07bf3bf01 no more clipped "Loc. (mm)"Author
- f567b3fe3a3e Add missing std namespace to endlAuthor
- bfbc459fe260 misc check box stuff darkthemeAuthor
- 9423512155ca Merge branch 'T23273-unsigned'Author
- f13abcff9cb9 Add IGT plugins to IGT categoryAuthor
Very Large Commit
This commit is very large, and affects more than 1000 files. Changes are not shown.