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

Merge branch 'RDM-2020-0024-SDT_4_0_-_Renaming_Data_Types' 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/test/subdevices-test.xml
parents ff202849 6af1118e
Branches RDM-2019-0065-SDT_4_0_-_Documentation_changes
No related tags found
Loading
Showing
with 85 additions and 85 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment