Merge branch 'bug-12235-integrate-dicom-plugin'
Conflicts:
Modules/CMakeLists.txt
Description
Description
Details
Details
- Provenance
• bauerm Authored on Jul 5 2012, 10:55 AM - Parents
- rMITK6ea6501dfdbc: tabulator fix
rMITKa5df7c3ca9dc: Merge branch 'bug-12182-DepartmentLogoNotShownIn3D' - 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.
- 6ea6501dfdbc tabulator fixAuthor
- 0bd66519f250 Style fixedAuthor
- b4edfc8e05f2 Fixed some includesAuthor
- a2db6c3fa7ac Use QT Sql include dirsAuthor
- 677b98f4949b removed tabsAuthor
- 81560f6e2b7d removed tabulatorsAuthor
- 4cd60d78348d basic progressbar implimentationAuthor
- 7032fe70e956 fixed memory leakAuthor
- 5398c1362e65 ctk with no dicomdir supportAuthor
- 1572e4b00935 adjust includes and pathAuthor
- 0c8959355596 stage fileAuthor
- 531516d89549 use working ctk version for mitkAuthor
- 0646e979b9b7 apply ctk changesAuthor
- 7f2ed1c19904 exclude preference pageAuthor
- 0e8413c4e1a8 improve code of dicom editorAuthor
- 2d45c7bb0348 added preference PageAuthor
- dd05b109ba46 added castAuthor
- 2323f83af1d3 adjusted includesAuthor
- 7cdfb56e8d4d added preference pageAuthor
- 6e01663c6205 add preference pageAuthor
- a6e6e6fdf27a cleaned up some code and includesAuthor
- 88d80c13ab30 new handlerAuthor
- b2ca732c4e94 event handler testAuthor
- cafc8e72d1bb adjust include pathAuthor
- 3bd650eb7198 deleted target_libraries.cmakeAuthor
- f771e937c505 changed cmakelistsAuthor
- 485fd566fa66 added file target_libraries.cmakeAuthor
- 3b75a821e2eb added publisherAuthor
