Merge branch 'bug-11542-move-mitkDiffusion-open-source'
74bfcbe25db6
Actions

Description

Merge branch 'bug-11542-move-mitkDiffusion-open-source'

Details

Provenance

Authored on Apr 3 2012, 2:38 PM

Parents

rMITKfa29052c2b84: Changed dependencies to be added to right target
rMITK89d0cc216a18: Merge branch 'bug-11514-move-connectomics-open-source'

Branches

Unknown

Tags

Unknown

Event Timeline

• goch committed rMITK74bfcbe25db6: Merge branch 'bug-11542-move-mitkDiffusion-open-source' (authored by • goch).Apr 3 2012, 2:38 PM

Merged Changes

fa29052c2b84 Changed dependencies to be added to right target
Author
• goch
Browse Repository
No Builds
No Audits
7331afc4318f Added missing plugins
Author
• goch
Browse Repository
No Builds
No Audits
225634d69908 WIP: fixed provisioning file
Author
• goch
Browse Repository
No Builds
No Audits
340c7fe8d31e WIP: moved all files open source
Author
• goch
Browse Repository
No Builds
No Audits

Changes (17)

Path

Size

Packages

Applications/

AppList.cmake

CMakeLists.txt

mitkDiffusion

QDiffusionImagingSplashScreen.cpp

startmitkDiffusion.bat.in

	mitkDiffusion/
	ExtApp/

CMakeLists.txt

	mitkDiffusion.cpp
	ExtApp.cpp

target_libraries.cmake

	Applications/	mitkDiffusion/	QDiffusionImagingSplashScreen.h/
	Modules/	SceneSerialization/	BaseDataSerializer/


	mitkImageSerializer.h

CMake/

CPackDiffusionConfig.cmake.in

O1: MITK Reviewer Group I

CPackOptionsDiffusion.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

DiffusionCopyright.txt

rMITK74bfcbe25db6

View Options

Applications/AppList.cmake

View Options

Applications/CMakeLists.txt

View Options

Applications/mitkDiffusion/CMakeLists.txt

View Options

Applications/mitkDiffusion/QDiffusionImagingSplashScreen.cpp

View Options

Applications/mitkDiffusion/QDiffusionImagingSplashScreen.h

View Options

Applications/mitkDiffusion/mitkDiffusion.cpp

View Options

Applications/mitkDiffusion/mitkDiffusion.ini

View Options

Applications/mitkDiffusion/splashscreen.png

View Options

Applications/mitkDiffusion/splashscreen.qrc

View Options

Applications/mitkDiffusion/splashscreen.xcf

View Options

Applications/mitkDiffusion/startmitkDiffusion.bat.in

View Options

Applications/mitkDiffusion/target_libraries.cmake

View Options

CMake/CPackDiffusionConfig.cmake.in

View Options

CMake/CPackOptionsDiffusion.cmake

View Options

CMakeLists.txt

View Options

Merge branch 'bug-11542-move-mitkDiffusion-open-source'74bfcbe25db6Actions

Description

Details

Event Timeline

Merged Changes

Changes (17)

rMITK74bfcbe25db6

Applications/AppList.cmake

Applications/CMakeLists.txt

Applications/mitkDiffusion/CMakeLists.txt

Applications/mitkDiffusion/QDiffusionImagingSplashScreen.cpp

Applications/mitkDiffusion/QDiffusionImagingSplashScreen.h

Applications/mitkDiffusion/mitkDiffusion.cpp

Applications/mitkDiffusion/mitkDiffusion.ini

Applications/mitkDiffusion/splashscreen.png

Applications/mitkDiffusion/splashscreen.qrc

Applications/mitkDiffusion/splashscreen.xcf

Applications/mitkDiffusion/startmitkDiffusion.bat.in

Applications/mitkDiffusion/target_libraries.cmake

CMake/CPackDiffusionConfig.cmake.in

CMake/CPackOptionsDiffusion.cmake

CMakeLists.txt

DiffusionCopyright.txt

Merge branch 'bug-11542-move-mitkDiffusion-open-source'
74bfcbe25db6
Actions