Diffusion MITK 81dada67aa3b

Merge branch 'master' of mitk.org:MITK
81dada67aa3b
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'master' of mitk.org:MITK

Details

Provenance

Authored on Mar 15 2015, 5:56 PM

Parents

rMITK71e2ebef2cba: Merge branch 'bug-18819-check-file-extension' of https://github.
rMITK4a579fb7829c: Merge branch 'bug-18831-compile-error-in-mbilog-mac'

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITK81dada67aa3b: Merge branch 'master' of mitk.org:MITK (authored by • fetzer).Mar 15 2015, 5:56 PM

Merged Changes

71e2ebef2cba Merge branch 'bug-18819-check-file-extension' of https://github.
Author
zelzer
Browse Repository
No Builds
No Audits
3bd5c13bd95d Merge branch 'bug-18846-RemoveNumpyFromAllBuildConfig'
Author
kislinsk
Browse Repository
No Builds
No Audits
fa8753fc9bdb COMP: Remove Numpy from All build configuration.
Author
kislinsk
Browse Repository
No Builds
No Audits
02e16b7513d6 Merge branch 'bug-18843-improve-ctest-error-reporting'
Author
nolden
Browse Repository
No Builds
No Audits
57eb7416acd8 COMP: Merge branch 'bug-18824-BoostWinIncludeDir'
Author
kislinsk
Browse Repository
No Builds
No Audits
b7b63aa01b92 COMP: handle missing argument to check_for_errors
Author
nolden
Browse Repository
No Builds
No Audits
62a0e51780a3 Fixed Boost include directory for Windows.
Author
kislinsk
Browse Repository
No Builds
No Audits
a15f4cee4a37 Merge branch 'bug-18818-FixUpExtensionsForGE4andGE5ImageIO'
Author
kislinsk
Browse Repository
No Builds
No Audits
7b2d25962dc0 Merge branch 'bug-18843-improve-ctest-error-reporting'
Author
zelzer
Browse Repository
No Builds
No Audits
998d248b6e32 Build external projects separately during ctest super-build.
Author
zelzer
Browse Repository
No Builds
No Audits
fafe8e0799c5 Make sure launchers are used in external projects.
Author
zelzer
Browse Repository
No Builds
No Audits
6b5cf1eeac94 Merge branch 'bug-18814-MiddlePositionInManufacturerLogo'
Author
• kolbch
Browse Repository
No Builds
No Audits
933db171862d Check file extension, and use try/catch for CLI module.
Author
clarkson
Browse Repository
No Builds
No Audits
3c755b8d1065 add middle position to logooverlay
Author
• kolbch
Browse Repository
No Builds
No Audits
f1341902accb deprecate manufacturerlogo
Author
• kolbch
Browse Repository
No Builds
No Audits
ef71936054a4 Merge branch 'bug-18820-setCrosshairAsOverlayRenderer'
Author
• kolbch
Browse Repository
No Builds
No Audits
4f7a01663f77 Merge branch 'bug-18701-AddTimestepsupportTomitkUnstructuredGrid'
Author
• kolbch
Browse Repository
No Builds
No Audits
915e6e2fe3ae remove unused widget in logooverlay and fix middle position in ManufacturerLogo
Author
• kolbch
Browse Repository
No Builds
No Audits
4591982cfa2d Merge branch 'bug-18831-compile-error-in-mbilog-mac'
Author
• fetzer
Browse Repository
No Builds
No Audits
83f08de62205 COMP Added include again for windows
Author
• fetzer
Browse Repository
No Builds
No Audits
fefaf5525878 Merge branch 'bug-18808-CornerAnnotations'
Author
neher
Browse Repository
No Builds
No Audits
df59e3f9f3ae Merge branch 'bug-18667-MultiComponentBinaryCrash2'
Author
neher
Browse Repository
No Builds
No Audits
eb5b08a2ea98 Merge branch 'bug-18831-compile-error-in-mbilog-mac'
Author
• fetzer
Browse Repository
No Builds
No Audits
1f5ecc3f507f setting Image.Displayed Component property correctly
Author
neher
Browse Repository
No Builds
No Audits
1f496b6f15c9 render timesteps in unstructuredGridMapper
Author
• kolbch
Browse Repository
No Builds
No Audits
7b4bb9eb38bd set crosshair as actor2D
Author
• kolbch
Browse Repository
No Builds
No Audits
29c0a0901b8c Fix up empty file extensions for ITK GE4 and GE5 ImageIO.
Author
kislinsk
Browse Repository
No Builds
No Audits
3d049ae53b9b removed corner annotations in screenshots
Author
neher
Browse Repository
No Builds
No Audits

Changes (47)

Path

Size

Packages

CMake/

BuildConfigurations/

O1: MITK Reviewer Group I

MITKDashboardDriverScript.cmake

O1: MITK Reviewer Group I

MITKDashboardSetup.cmake

O1: MITK Reviewer Group I

CMakeExternals/

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

OpenIGTLink.cmake

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

SimpleITK.cmake

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

Modules/

Core/

include/

mitkManufacturerLogo.h

O1: MITK Reviewer Group I

mitkPlaneGeometryDataMapper2D.h

O1: MITK Reviewer Group I

src/

IO/

mitkItkImageIO.cpp

O1: MITK Reviewer Group I

Rendering/

mitkImageVtkMapper2D.cpp

O1: MITK Reviewer Group I

mitkManufacturerLogo.cpp

O1: MITK Reviewer Group I

mitkPlaneGeometryDataMapper2D.cpp

O1: MITK Reviewer Group I

DataTypesExt/

src/

mitkUnstructuredGrid.cpp

MapperExt/

include/

mitkUnstructuredGridMapper2D.h

src/

mitkUnstructuredGridMapper2D.cpp

Overlays/

mitkLogoOverlay.cpp

mitkLogoOverlay.h

mitkVtkLogoRepresentation.cxx

QtWidgets/

include/

QmitkStdMultiWidget.h

O3: MITK Reviewer Group II

src/

QmitkStdMultiWidget.cpp

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.qt.cmdlinemodules/

src/

internal/

QmitkCmdLineModuleRunner.cpp

O3: MITK Reviewer Group II

org.mitk.gui.qt.moviemaker/

src/

internal/

QmitkScreenshotMaker.cpp

O3: MITK Reviewer Group II

SuperBuild.cmake

O1: MITK Reviewer Group I

Utilities/

mbilog/

mbilogTextBackendBase.cpp

rMITK81dada67aa3b

CMake/BuildConfigurations/All.cmake

Loading...

CMake/MITKDashboardDriverScript.cmake

Loading...

CMake/MITKDashboardSetup.cmake

Loading...

CMakeExternals/ACVD.cmake

Loading...

CMakeExternals/ANN.cmake

Loading...

CMakeExternals/Boost.cmake

Loading...

CMakeExternals/CTK.cmake

Loading...

CMakeExternals/CppUnit.cmake

Loading...

CMakeExternals/DCMTK.cmake

Loading...

CMakeExternals/GDCM.cmake

Loading...

CMakeExternals/GLEW.cmake

Loading...

CMakeExternals/GLUT.cmake

Loading...

CMakeExternals/HDF5.cmake

Loading...

CMakeExternals/ITK.cmake

Loading...

CMakeExternals/OpenCV.cmake

Loading...

CMakeExternals/OpenIGTLink.cmake

Loading...

CMakeExternals/PCRE.cmake

Loading...

CMakeExternals/Poco.cmake

Loading...

CMakeExternals/Python.cmake

Loading...

CMakeExternals/Qwt.cmake

Loading...

CMakeExternals/Raptor2.cmake

Loading...

CMakeExternals/Rasqal.cmake

Loading...

CMakeExternals/Redland.cmake

Loading...

CMakeExternals/SOFA.cmake

Loading...

CMakeExternals/SimpleITK.cmake

Loading...

CMakeExternals/VTK.cmake

Loading...

CMakeExternals/Vigra.cmake

Loading...

CMakeExternals/ZLIB.cmake

Loading...

CMakeExternals/tinyxml.cmake

Loading...

Modules/Core/include/mitkManufacturerLogo.h

Loading...

Modules/Core/include/mitkPlaneGeometryDataMapper2D.h

Loading...

Modules/Core/src/IO/mitkItkImageIO.cpp

Loading...

Modules/Core/src/Rendering/mitkImageVtkMapper2D.cpp

Loading...

Modules/Core/src/Rendering/mitkManufacturerLogo.cpp

Loading...

Modules/Core/src/Rendering/mitkPlaneGeometryDataMapper2D.cpp

Loading...

Modules/DataTypesExt/src/mitkUnstructuredGrid.cpp

Loading...

Modules/MapperExt/include/mitkUnstructuredGridMapper2D.h

Loading...

Modules/MapperExt/src/mitkUnstructuredGridMapper2D.cpp

Loading...

Modules/Overlays/mitkLogoOverlay.cpp

Loading...

Modules/Overlays/mitkLogoOverlay.h

Loading...

Modules/Overlays/mitkVtkLogoRepresentation.cxx

Loading...

Modules/QtWidgets/include/QmitkStdMultiWidget.h

Loading...

Modules/QtWidgets/src/QmitkStdMultiWidget.cpp

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/QmitkCmdLineModuleRunner.cpp

Loading...

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMaker.cpp

Loading...

SuperBuild.cmake

Loading...

Utilities/mbilog/mbilogTextBackendBase.cpp

Loading...