Merge remote-tracking branch 'remotes/origin/bug-12333-IntegrateUSImageMetadataIntoServiceProperties' into bug-12750-MakeUSDeviceSupportTransformations
Conflicts:
Modules/US/USModel/mitkUSDevice.cpp
Modules/US/USModel/mitkUSImageMetadata.h
Description
Description
Details
Details
- Provenance
maerz Authored on Jul 30 2012, 11:53 AM - Parents
- rMITK68e988b63493: Calibration Workflow nearly completed, but needs merge with Metadata Branch
rMITK06c072b6b8b5: Added field DeviceClass to Metadata - Branches
- Unknown
- Tags
Merged Changes
Merged Changes