Diffusion MITK c4e3acf77cf3

Merge branch 'bug-10517-support-library-preloading'
c4e3acf77cf3
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-10517-support-library-preloading'

bug-10517-support-library-preloading: Wait 10 secs for shutdown, instead of 30. Use new "preload library" feature from the CTK Plugin FW. Fixed missing CMake cache entry for provisioning files on first configure. Added more diagnostic output.

Conflicts:
CMakeExternals/CTK.cmake

Details

Provenance

Authored on Dec 21 2011, 11:05 PM

Parents

rMITK729c6836ac9b: Wait 10 secs for shutdown, instead of 30.
rMITKd8e8542ad032: Merge branch 'bug-10131-enable-private-modules'

Branches

Unknown

Tags

Unknown

Event Timeline

zelzer committed rMITKc4e3acf77cf3: Merge branch 'bug-10517-support-library-preloading' (authored by zelzer).Dec 21 2011, 11:05 PM

Merged Changes

729c6836ac9b Wait 10 secs for shutdown, instead of 30.
Author
zelzer
Browse Repository
No Builds
No Audits
bc3ef3b4ba38 Use new "preload library" feature from the CTK Plugin FW.
Author
zelzer
Browse Repository
No Builds
No Audits
8b0f6fd77abc Fixed missing CMake cache entry for provisioning files on first configure.
Author
zelzer
Browse Repository
No Builds
No Audits
e848f65c81b4 Added more diagnostic output.
Author
zelzer
Browse Repository
No Builds
No Audits

Changes (10)

Path

Size

Packages

Applications/

CoreApp/

ExtApp/

BlueBerry/

Bundles/

org.blueberry.osgi/

src/

berryPlatform.cpp

berryPlatform.h

internal/

berryInternalPlatform.cpp

berryInternalPlatform.h

service/

berryServiceRegistry.txx

CMakeExternals/

O1: MITK Reviewer Group I

rMITKc4e3acf77cf3

Applications/CoreApp/CMakeLists.txt

Loading...

Applications/CoreApp/CoreApp.cpp

Loading...

Applications/ExtApp/CMakeLists.txt

Loading...

Applications/ExtApp/ExtApp.cpp

Loading...

BlueBerry/Bundles/org.blueberry.osgi/src/berryPlatform.cpp

Loading...

BlueBerry/Bundles/org.blueberry.osgi/src/berryPlatform.h

Loading...

BlueBerry/Bundles/org.blueberry.osgi/src/internal/berryInternalPlatform.cpp

Loading...

BlueBerry/Bundles/org.blueberry.osgi/src/internal/berryInternalPlatform.h

Loading...

BlueBerry/Bundles/org.blueberry.osgi/src/service/berryServiceRegistry.txx

Loading...

CMakeExternals/CTK.cmake

Loading...