Diffusion MITK f4dfc10c4dd0

Merge branch 'master' into niftk to include MITK org.mitk.gui.qt.cmdlinemodules…
f4dfc10c4dd0Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge branch 'master' into niftk to include MITK org.mitk.gui.qt.cmdlinemodules and fix to add Add POCO_NO_UNWINDOWS and WIN32_LEAN_AND_MEAN to BlueBerry apps..

Details

Provenance

clarkson	Authored on Mar 1 2013, 8:28 PM
kislinsk	Pushed on Aug 6 2018, 4:04 PM

Parents

rMITKc440edddb541: Merge first signed off version of branch 'MITK-bug-12506-trac-1588-MITK-plugin…
rMITK626784deb8f6: Merge branch 'bug-14623-add-poco-no-unwindows-defines-to-apps'

Branches

Unknown

Tags

Unknown

Event Timeline

clarkson committed rMITKf4dfc10c4dd0: Merge branch 'master' into niftk to include MITK org.mitk.gui.qt.cmdlinemodules… (authored by clarkson).Mar 1 2013, 8:28 PM

Merged Changes

626784deb8f6 Merge branch 'bug-14623-add-poco-no-unwindows-defines-to-apps'
Author
zelzer
Browse Repository
No Builds
No Audits
f4612781b10f Merge branch 'bug-12506-plugin-for-ctk-cli'
Author
zelzer
Browse Repository
No Builds
No Audits
0d6d5702f85e Add POCO_NO_UNWINDOWS and WIN32_LEAN_AND_MEAN to BlueBerry apps.
Author
zelzer
Browse Repository
No Builds
No Audits
39dedcf901eb Merge branch 'bug-11046-more-clang-fixes'
Author
nolden
Browse Repository
No Builds
No Audits
4e56b8e9d45f Make DEPRECATED macro compatible with clang
Author
nolden
Browse Repository
No Builds
No Audits
5d10ea416048 Use new CTK for command line module support.
Author
zelzer
Browse Repository
No Builds
No Audits
2983d659c2b1 Merge branch 'bug-12506-plugin-for-ctk-cli-orig' into bug-12506-plugin-for-ctk…
Author
zelzer
Browse Repository
No Builds
No Audits
3e8b9bb1384c Merge branch 'bug-14572-TransferFunctionRenderingTest'
Author
• kilgus
Browse Repository
No Builds
No Audits
b0c0ba6aa8a0 COMP: doubling tolerance threshold for issues on windows.
Author
• kilgus
Browse Repository
No Builds
No Audits
eb2cf258c6b5 Merge branch 'bug-14572-TransferFunctionRenderingTest'
Author
• kilgus
Browse Repository
No Builds
No Audits
96ca19d2d46b COMP: Removed unused lines to force a new conflict for merging corret data hash…
Author
• kilgus
Browse Repository
No Builds
No Audits
917200cdbf41 Merge branch 'bug-14572-TransferFunctionRenderingTest'
Author
• kilgus
Browse Repository
No Builds
No Audits
6f780d392d16 New MITK-Data hash for new test data.
Author
• kilgus
Browse Repository
No Builds
No Audits
444929f4085c Added test to CMakeList and a .cpp. Test data is currently only added in…
Author
• kilgus
Browse Repository
No Builds
No Audits

Changes (21)

Path

Size

Packages

BlueBerry/

CMake/

FunctionCreateBlueBerryApplication.cmake

CMakeExternals/

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

Core/

Code/

Common/

Testing/

	mitkImageVtkMapper2DTransferFunctionTest.cpp
	mitkImageVtkMapper2DColorTest.cpp

Plugins/

org.mitk.gui.qt.cmdlinemodules/

O3: MITK Reviewer Group II

documentation/

UserManual/

O3: MITK Reviewer Group II

doxygen/

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

src/

QmitkCmdLineModuleMenuComboBox.cpp

O3: MITK Reviewer Group II

QmitkCmdLineModuleMenuComboBox.h

O3: MITK Reviewer Group II

internal/

CommandLineModulesPreferencesPage.h

O3: MITK Reviewer Group II

CommandLineModulesView.h

O3: MITK Reviewer Group II

CommandLineModulesViewControls.h

O3: MITK Reviewer Group II

QmitkCmdLineModuleFactoryGui.cpp

O3: MITK Reviewer Group II

QmitkDataStorageComboBoxWithSelectNone.h

O3: MITK Reviewer Group II

QmitkUiLoader.cpp

O3: MITK Reviewer Group II

QmitkUiLoader.h

O3: MITK Reviewer Group II

rMITKf4dfc10c4dd0

BlueBerry/CMake/FunctionCreateBlueBerryApplication.cmake

Loading...

CMakeExternals/CTK.cmake

Loading...

CMakeExternals/MITKData.cmake

Loading...

Core/Code/Common/mitkCommon.h

Loading...

Core/Code/Testing/CMakeLists.txt

Loading...

Core/Code/Testing/files.cmake

Loading...

Core/Code/Testing/mitkImageVtkMapper2DTransferFunctionTest.cpp

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/CMakeLists.txt

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/documentation/UserManual/Manual.dox

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/documentation/doxygen/modules.dox

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/files.cmake

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/plugin.xml

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/src/QmitkCmdLineModuleMenuComboBox.cpp

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/src/QmitkCmdLineModuleMenuComboBox.h

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/CommandLineModulesPreferencesPage.h

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/CommandLineModulesView.h

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/CommandLineModulesViewControls.h

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/QmitkDataStorageComboBoxWithSelectNone.h

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/QmitkUiLoader.h

Loading...