Diffusion MITK 82b1bb48142f

Merge branch 'master' of mitk.org:MITK
82b1bb48142f
Actions

Description

Merge branch 'master' of mitk.org:MITK

Conflicts:
Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Details

Provenance

• kirchnth

Authored on Mar 2 2015, 4:40 PM

Parents

rMITK6433cbeff05f: Merge branch 'bug-18696-SeperatelySetRenderAndLoggingUpdateRate'
rMITK16d810d9d1b0: Merge branch 'bug-18798-Qt5Adaptions'

Branches

Unknown

Tags

Unknown

Event Timeline

• kirchnth committed rMITK82b1bb48142f: Merge branch 'master' of mitk.org:MITK (authored by • kirchnth).Mar 2 2015, 4:40 PM

Merged Changes

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

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
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
3d5eaaf6721e Merge branch 'bug-18605-buildsystem'
Author
kislinsk
Browse Repository
No Builds
No Audits
7d33028f8d62 COMP: Recovered MitkExtQtHelpCollection.qhc.
Author
kislinsk
Browse Repository
No Builds
No Audits
27e82589432a Fixed COPYONLY parameters of configure_file commands.
Author
kislinsk
Browse Repository
No Builds
No Audits
99e3c66c8d49 Merge branch 'bug-1849-command-framework-and-blueberry-simplification'
Author
zelzer
Browse Repository
No Builds
No Audits
6caa5a88e91d COMP: Try fixing Qt interface and object_cast Windows error.
Author
zelzer
Browse Repository
No Builds
No Audits
b6d811f464d9 Merge branch 'bug-1849-command-framework-and-blueberry-simplification'
Author
zelzer
Browse Repository
No Builds
No Audits
a17a83ac6933 COMP: Don't use BERRY_STATUS_LOC outside of functions.
Author
zelzer
Browse Repository
No Builds
No Audits
eec0c53ed64b Merge branch 'bug-1849-command-framework-and-blueberry-simplification'
Author
zelzer
Browse Repository
No Builds
No Audits
d0d408c5ca93 COMP: Qt5 compatibility fixes.
Author
zelzer
Browse Repository
No Builds
No Audits
6879c4df49f2 COMP: Removed C++11 override keyword unsupported by gcc 4.6.
Author
zelzer
Browse Repository
No Builds
No Audits
8853bb8de9fe Merge branch 'bug-1849-command-framework-and-blueberry-simplification'
Author
zelzer
Browse Repository
No Builds
No Audits
b63554ec48d7 COMP: QAtomicInt changed in Qt5.
Author
zelzer
Browse Repository
No Builds
No Audits
e8ba849be121 Merge branch 'bug-1849-command-framework-and-blueberry-simplification'
Author
zelzer
Browse Repository
No Builds
No Audits
74810eb952e4 COMP: Don't use override yet.
Author
zelzer
Browse Repository
No Builds
No Audits
7d5332dc8b5b Merge branch 'bug-1849-command-framework-and-blueberry-simplification'
Author
zelzer
Browse Repository
No Builds
No Audits
36768e4aeb60 Added missing underscore to C function in msvcrt.
Author
zelzer
Browse Repository
No Builds
No Audits
4f8266cc67d0 Started using Qt layouts and events instead of custom classes.
Author
zelzer
Browse Repository
No Builds
No Audits
de944d8ce0fa Using Qt classes instead of void* now.
Author
zelzer
Browse Repository
No Builds
No Audits
4f04fb7f6a7d Merge branch 'bug-18752-PreserveDepthBufferInForegroundRenderers'
Author
• kolbch
Browse Repository
No Builds
No Audits
7b7189e84c27 Merge branch 'bug-18656-IoExtIntegrationBranch'
Author
• kirchnth
Browse Repository
No Builds
No Audits
5bbeff42380a Removed drag'n drop tweaklet and custom Point and Rectangle classes.
Author
zelzer
Browse Repository
No Builds
No Audits
23ca18d59b88 Fixed DataStorage service retrieval.
Author
zelzer
Browse Repository
No Builds
No Audits
2221fa26652a Don't manage null pointers.
Author
zelzer
Browse Repository
No Builds
No Audits
c426ea93ddf4 Check if the Workbench is still running.
Author
zelzer
Browse Repository
No Builds
No Audits
715fe31eae33 Removed ImageTweaklet and ImageDescriptor classes in favor of QIcon.
Author
zelzer
Browse Repository
No Builds
No Audits
e68785e09b1a PreserveDepthBufferOn to all foreground renderers
Author
• kolbch
Browse Repository
No Builds
No Audits
57c8c3343a1c Avoid recursive mutex locks.
Author
zelzer
Browse Repository
No Builds
No Audits
be4b6fd9b2ff Use old workaround for menu and toolbar entries again.
Author
zelzer
Browse Repository
No Builds
No Audits
7ffcfd0eadf7 Don't use exception specifications.
Author
zelzer
Browse Repository
No Builds
No Audits
55a066d78a2c Fixed wrong crosshair position in rotated planes. Changes: PlaneGeometry - no…
Author
Esther Wild <e.wild@dkfz.de>
Browse Repository
No Builds
No Audits
d26da0bf938b Merge branch 'bug-18656-RemoveLegacyIOFromUnstructuredGrid' into bug-18656…
Author
• kirchnth
Browse Repository
No Builds
No Audits
cf4f1fcf25f3 unstructured grid reader now works as a abstract file reader
Author
• kirchnth
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:MITK82b1bb48142fActions

Description

Details

Event Timeline

Merged Changes

Very Large Commit

Merge branch 'master' of mitk.org:MITK
82b1bb48142f
Actions