Merge branch 'master' of mitk.org:MITK
c4c82385c0e0
Actions

Description

Merge branch 'master' of mitk.org:MITK

Details

Provenance

Authored on Mar 5 2015, 9:04 PM

Parents

rMITKd41abb08a2df: Merge branch 'bug-18810-2DInterpolationIn4DImagesInNonAxialWindows'
rMITK0eb7852b6d51: Merge branch 'master' of mitk.org:MITK

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITKc4c82385c0e0: Merge branch 'master' of mitk.org:MITK (authored by • fetzer).Mar 5 2015, 9:04 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

d41abb08a2df Merge branch 'bug-18810-2DInterpolationIn4DImagesInNonAxialWindows'
Author
kislinsk
Browse Repository
No Builds
No Audits
d09c825a7880 Recreate slice extract filter for extracting lower and upper slices.
Author
kislinsk
Browse Repository
No Builds
No Audits
3f1ef8b063f8 Merge branch 'bug-18807-menubar-osx'
Author
• cordes
Browse Repository
No Builds
No Audits
edb7990807b1 Merge branch 'bug-18804-use-options-ordering'
Author
zelzer
Browse Repository
No Builds
No Audits
ebe00e5c8245 COMP: Move use options before build configuration parse step.
Author
zelzer
Browse Repository
No Builds
No Audits
d85209776048 Merge branch 'bug-18657-ITK-Version-4_7_1-COMPs'
Author
• hering
Browse Repository
No Builds
No Audits
b019e579cb21 COMP Add missing itkMacro include
Author
• hering
Browse Repository
No Builds
No Audits
b52b734a6970 Merge branch 'bug-18657-ITK-Version-4_7_1'
Author
• hering
Browse Repository
No Builds
No Audits
24826b0ededb Merge branch 'bug-18649-RenamingNodes-ComboBoxWithSelectNone'
Author
• hering
Browse Repository
No Builds
No Audits
75b76ea82232 Add checks for node renaming
Author
• hering
Browse Repository
No Builds
No Audits
20eb3c166478 add exception for APPLE
Author
• cordes
Browse Repository
No Builds
No Audits
fee152df2343 Merge branch 'bug-18636-2DInterpolationIn4DImages'
Author
kislinsk
Browse Repository
No Builds
No Audits
7898204b9e12 Fixed 2D interpolation in 4D images.
Author
kislinsk
Browse Repository
No Builds
No Audits
b8d82bc076f9 Merge branch 'bug-18798-AddCMAKE-PREFIX-PATHToCache'
Author
kislinsk
Browse Repository
No Builds
No Audits
842c624fe2e3 Added CMAKE_PREFIX_PATH to CMake cache.
Author
kislinsk
Browse Repository
No Builds
No Audits
355acae66693 Merge branch 'bug-1849-command-framework-and-blueberry-simplification'
Author
zelzer
Browse Repository
No Builds
No Audits
1f28d425f28c Fixed crash triggered by out of range column indices.
Author
zelzer
Browse Repository
No Builds
No Audits
04ce64109b9c Workaround for showing the application menu bar on Linux using Qt5.
Author
zelzer
Browse Repository
No Builds
No Audits
854fe47627d5 CTK services need to be retreived via a ctkPluginContext object.
Author
zelzer
Browse Repository
No Builds
No Audits
bf1091f7603b Fixed path calculation for installed provisioning file.
Author
zelzer
Browse Repository
No Builds
No Audits
86947b2601d8 Fixed install scripts related to org.blueberry.osgi renaming.
Author
zelzer
Browse Repository
No Builds
No Audits
09f0a98e6062 Merge branch 'bug-18798-RemoveQT5-INSTALL-PREFIX'
Author
kislinsk
Browse Repository
No Builds
No Audits
4d0405c46e9f Removed QT5_INSTALL_PREFIX. Use CMAKE_PREFIX_PATH instead.
Author
kislinsk
Browse Repository
No Builds
No Audits
1e16fcc94f46 Merge branch 'bug-18802-CreateMitkSurfaceToPointSetFilter'
Author
• brehler
Browse Repository
No Builds
No Audits
fcae70cac41a COMP: fixed hidden virtual error
Author
• brehler
Browse Repository
No Builds
No Audits
22ea56f61237 Merge branch 'bug-18802-CreateMitkSurfaceToPointSetFilter'
Author
• brehler
Browse Repository
No Builds
No Audits
354cbc93ba0c Added general purpose filter to module MitkAlgorithmsExt
Author
• brehler
Browse Repository
No Builds
No Audits
da382ecdae81 Merge remote-tracking branch 'origin/bug-1849-command-framework-fixups' into…
Author
zelzer
Browse Repository
No Builds
No Audits
dbe4ce8414de Merge remote-tracking branch 'origin/bug-18789-MovieMakerPreferencesService'…
Author
zelzer
Browse Repository
No Builds
No Audits
9b1a0db5ac29 Merge remote-tracking branch 'origin/bug-18605-buildsystem' into bug-1849…
Author
zelzer
Browse Repository
No Builds
No Audits
16d810d9d1b0 Merge branch 'bug-18798-Qt5Adaptions'
Author
kislinsk
Browse Repository
No Builds
No Audits
72caf15cb877 Default value for DESIRED_QT_VERSION is now 5 except for MacOS.
Author
kislinsk
Browse Repository
No Builds
No Audits
13be9cf18cde Improved dashboard script template.
Author
kislinsk
Browse Repository
No Builds
No Audits
2f264b9553ec Merge branch 'bug-1849-command-framework-fixups'
Author
nolden
Browse Repository
No Builds
No Audits
cc3b7ed35683 COMP: Fixed exported include directories
Author
nolden
Browse Repository
No Builds
No Audits
de558e1e0b9f Merge branch 'bug-15886-FixMOCFileErrorMBI'
Author
• metzger
Browse Repository
No Builds
No Audits
63a72c28cfa0 Delete mitkTubeGraphDefaultLabelGroups.h from moc files list
Author
• metzger
Browse Repository
No Builds
No Audits
7979c9cfd6b2 Merge branch 'bug-18789-MovieMakerPreferencesService'
Author
kislinsk
Browse Repository
No Builds
No Audits
5178ba17f0be Get preferences service via berry platform.
Author
kislinsk
Browse Repository
No Builds
No Audits
7ce1933e1a54 Update archive name and md5sum for 4.7.1
Author
• hering
Browse Repository
No Builds
No Audits
ebc8866857e2 Merge branch 'bug-18657-ITK-Version-4_7-IntBranch' into bug-18657-ITK-Version…
Author
• hering
Browse Repository
No Builds
No Audits
1981ea7ccc3c Merge branch 'bug-18710-RotatedPlanesPickingFix'
Author
• kolbch
Browse Repository
No Builds
No Audits
95c53317d0fd translated german comments.
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
9a2a5ab01e55 remove unused parameter warnings
Author
• kolbch
Browse Repository
No Builds
No Audits
6ae80abfcc64 Merge branch 'bug-18735-MetaAnalyse_V2' into bug-18735-RotatedPlanesIntegration
Author
• kolbch
Browse Repository
No Builds
No Audits
f56968879b4d Removed all Pre/Post functions except for PreSetSpacing. Replaced PreSetBounds…
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
96ce992e5d1e Merge branch 'bug-18762-DocuGeometryTools'
Author
• kilgus
Browse Repository
No Builds
No Audits
0d7c4bae40b2 Added docu for geometry tools plugin.
Author
• kilgus
Browse Repository
No Builds
No Audits
15c9a7b2bb91 Merge branch 'bug-18764-Curvthres'
Author
neher
Browse Repository
No Builds
No Audits
b22d87441c79 filling initial vector with zeros
Author
neher
Browse Repository
No Builds
No Audits

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.

Merge branch 'master' of mitk.org:MITKc4c82385c0e0Actions

Description

Details

Event Timeline

Merged Changes

Very Large Commit

Merge branch 'master' of mitk.org:MITK
c4c82385c0e0
Actions