Commit 8a3b5cad authored by ankraft's avatar ankraft
Browse files

Merge branch 'MAS-2018-0140-SDT_4_0_–_Adding_support_for_semantic_references'...

Merge branch 'MAS-2018-0140-SDT_4_0_–_Adding_support_for_semantic_references' into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
#	SDT/schema4.0/docs/images/SDT_UML_DataType.png
parents 731e39bf bc428a94
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment