Skip to content
Snippets Groups Projects
Commit 8d27215b authored by Andreas Kraft's avatar Andreas Kraft
Browse files

Merge branch 'RDM-2020-0026-SDT_4_0_–_Introducing_Referenced_SubDevices' into... 

Merge branch 'RDM-2020-0026-SDT_4_0_–_Introducing_Referenced_SubDevices' 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_simplified.png
#	SDT/schema4.0/docs/images/SubDevice.png
parents da653653 faca2bd9
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 60 additions and 5 deletions
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