Merge remote-tracking branch 'origin/master' into T24660-selection_history_inspector
- Conflicts:
- Modules/QtWidgets/src/mitkQtWidgetsActivator.cpp
- Modules/QtWidgets/src/mitkQtWidgetsActivator.h
Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>
Description
Description
Details
Details
- Provenance
floca Authored on Jan 22 2020, 1:33 PM floca Pushed on Jan 22 2020, 1:37 PM floca Pushed on Jan 22 2020, 1:34 PM - Differential Revision
- Restricted Differential Revision
- Parents
- rMITK9c096725e520: Merge branch 'T26977-FixWarnings'
rMITK93827c374c6b: Fixed review remarks. - Branches
- Unknown
- Tags
- Unknown
Event Timeline
floca added an edge: Restricted Differential Revision.Apr 30 2020, 11:43 PM2020-04-30 23:43:06 (UTC+2)
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- 9c096725e520 Merge branch 'T26977-FixWarnings'Author
- e315ea04a30a Disable randomly failing testAuthor
- 837dbe368af2 Fix if-conditionAuthor
- 0797e9c5fe24 Fix test declarationsAuthor
- d09bb9dd863a Add MITK_XVFB_TESTING optionAuthor
- 94adc0ebd8e8 Add suggestions from D226Author
- e9a988a5cb42 Modernize and clean classAuthor
- 339c050c07de Fix IGNORE_ITEM parameter nameAuthor
- 1221316cb5db Port mitk tests to CPPUnitAuthor
- 43a77cff3c23 resolved merge conflictsAuthor
- e2b214a0eb5d Add a single node selection widgetAuthor
- 3f8115606192 Modernize and clean classAuthor
- 78ffa3d3aa42 Simplify logicAuthor
- bef7e116d21d Add a single node selection widgetAuthor
- 713aa629ad7a Fix T26958Author
- d4170f5dbca9 Do some code cleaningAuthor
- 13e7f96912aa Add new inspector for favorite nodesAuthor
- f2e9c3aeb49a Add missing header (macOS)Author
- 2c98c94e9afb Remove dangling declarationsAuthor