Commit b0de2ce3 authored by ankraft's avatar ankraft
Browse files

Merge branch...

Merge branch 'MAS-2018-0161-SDT_4_0_-_Support_for_excluding_certain_components_when_inheriting' 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 257dabb6 97a22b64
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