Merge remote-tracking branch 'origin/master' into bb_ctk
Conflicts:
BlueBerry/BlueBerryConfig.cmake.in
BlueBerry/CMake/MacroCollectPlugins.cmake
CMakeLists.txt
MITKConfig.cmake.in
Description
Description
Details
Details
- Provenance
zelzer Authored on Jun 1 2011, 10:12 AM - Parents
- rMITK29e0c527f2d9: Fix CoreApp and ExtApp dependencies to plugins.
rMITK992d9d3794ca: Merge branch 'bug-8143-OpenCVUbuntu11_4' - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- 2f1c10b1d4f4 removed output messagesAuthor
- fc297b4f87b6 corrected copy paste errorAuthor
- d56d9e19fa24 added complete xml tag to headerAuthor
- a04d58dfacd2 Added play and stop iconAuthor
- 896a3f06f48e Added documentationAuthor
- 924813482763 removed unnecessary includesAuthor
- f12fba14899f Remove vertical spacer from widgetAuthor
- 3b7c04cc45c6 Added "play" and "stop" iconAuthor
- 48253149bb81 added documentationAuthor
- c0334d0b7403 Some GUI changesAuthor
- a07a856e5260 set default to advanced style againAuthor
Very Large Commit
This commit is very large, and affects more than 1000 files. Changes are not shown.