Fixed conflicts in QmitkCommonFunctionality.cpp
Unpublished Commit · Learn More
Not On Permanent Ref: This commit is not an ancestor of any permanent ref.
Description
Description
Details
Details
- Provenance
clarkson Authored on May 8 2012, 9:43 AM kislinsk Pushed on Aug 6 2018, 4:04 PM - Parents
- rMITK2e5c698299a7: Merge branch 'master' into niftk
rMITK58f3a08c84d6: Merge branch 'bug-11820-paint-tool-is-not-working' - 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.
- a4866d1c598a checking if index is inside imageAuthor
- 7555ea913757 removed verticel spacerAuthor
- c5cb41ef1b8e Merge branch 'bug-11847-pv-freeze'Author
- 6dfa1f258851 always incrementing iteratorAuthor
- bc291397515b adjusted visibilityAuthor
- 393856bce536 Changed style to conform to restAuthor
- 761c502ad52d initializing geometry correctlyAuthor
- 4b11f23db249 Patch for ITK clang compatibilityAuthor
- 8fa522c835d2 Merge branch 'bug-11646-Tooltips'Author
- 630196e1f7bc On MacOS, use CMake >= 2.8.8.Author
- c6c789f767f4 Reuse the MITK DCMTK for CTK.Author
- b65511f9c8ea updated help pagesAuthor
- 9134fe8c2cc8 DOC: added commentAuthor