Skip to content
Snippets Groups Projects
Commit 47acffbc authored by ankraft's avatar ankraft
Browse files

Merge branch... 

Merge branch 'MAS-2018-0139-SDT_4_0_–_Adding_support_for_enumeration_types_and_values' into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_DataType.png
parents 8a9274ae 1027bce6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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