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

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
b0de2ce3 · ankraft · 257dabb6 · 97a22b64 · b0de2ce3 · 257dabb6
Commit b0de2ce3 authored Apr 03, 2019 by ankraft
3 changed files
--- a/SDT/schema4.0/docs/SDT_UML.uxf
+++ b/SDT/schema4.0/docs/SDT_UML.uxf
--- a/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
+++ b/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
--- a/SDT/schema4.0/docs/images/SDT_UML_DataType.png
+++ b/SDT/schema4.0/docs/images/SDT_UML_DataType.png