Diffusion MITK cb45842527a0

Merge branch 'bug-19052-add-vtk-include' into bug-1849-integration
cb45842527a0
Actions

Description

Merge branch 'bug-19052-add-vtk-include' into bug-1849-integration

Conflicts:
Plugins/org.mitk.gui.qt.application/src/QmitkFileExitAction.cpp

Details

Provenance

• goch

Authored on May 12 2015, 11:13 AM

Parents

rMITKb02ee814399b: Move File Exist Action to new framework
rMITKf463dc9d32c6: Add vtk include needed for version check to work

Branches

Unknown

Tags

Unknown

Event Timeline

• goch committed rMITKcb45842527a0: Merge branch 'bug-19052-add-vtk-include' into bug-1849-integration (authored by • goch).May 12 2015, 11:13 AM

Merged Changes

f463dc9d32c6 Add vtk include needed for version check to work
Author
• goch
Browse Repository
No Builds
No Audits
27fffd66a695 Merge branch 'bug-19035-cpp11-modernizations-2'
Author
nolden
Browse Repository
No Builds
No Audits
5da6f4053754 COMP: fix platform specific nullptr return
Author
nolden
Browse Repository
No Builds
No Audits
bef085c133c8 Merge branch 'bug-19035-cpp11-modernizations-2'
Author
nolden
Browse Repository
No Builds
No Audits
c02d036396af More c++ modernizations
Author
nolden
Browse Repository
No Builds
No Audits
74e51c3b47df Merge branch 'bug-1849-integration'
Author
• goch
Browse Repository
No Builds
No Audits
7f4441794500 Merge branch 'bug-19045-DownloadOfDicomFileFromXnatShouldDownloadAllSlices'
Author
• knorr
Browse Repository
No Builds
No Audits
612017ebbbdc Changed create plugin macro in CMakeLists.
Author
• knorr
Browse Repository
No Builds
No Audits
0d0cda9f2c1b Little change for readability.
Author
• knorr
Browse Repository
No Builds
No Audits
b492cea838c1 Merge branch 'bug-19044-transparency-for-jet-lut'
Author
• fetzer
Browse Repository
No Builds
No Audits
f0436458635a Added some if-clauses for checking if the decompressing was successful.
Author
• knorr
Browse Repository
No Builds
No Audits
c590d0b0c2fd Adjusted download functionality that no more download crashes should appear.
Author
• knorr
Browse Repository
No Builds
No Audits
c47cd69af519 Added Poco as Package dependancy and download DICOM in a zip-file. Afterwards…
Author
• knorr
Browse Repository
No Builds
No Audits
71db3380e658 Merge branch 'bug-1849-integration'
Author
• goch
Browse Repository
No Builds
No Audits
7230c0815ca9 Merge branch 'bug-1849-integration'
Author
• goch
Browse Repository
No Builds
No Audits
56fbb639bae5 Merge branch 'bug-19035-cpp11-modernizations'
Author
nolden
Browse Repository
No Builds
No Audits
5921ef85d980 Merge branch 'bug-1849-integration'
Author
• goch
Browse Repository
No Builds
No Audits
8c4d07b16fcb Changed Download to a loop where all dicom files get loaded.
Author
• knorr
Browse Repository
No Builds
No Audits
1f45dd501e08 Merge branch 'bug-1849-integration'
Author
• goch
Browse Repository
No Builds
No Audits
a5408ac833dc Added new predefined jet lut that makes the lowest intensity transparent.
Author
• fetzer
Browse Repository
No Builds
No Audits
5484101a6154 Merge branch 'bug-1849-integration'
Author
• goch
Browse Repository
No Builds
No Audits

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.