Merge branch 'develop'

DLR-SL · Jun 3, 2021 · bebd689 · bebd689
2 parents bfa7c91 + 3087063
commit bebd689
Show file tree

Hide file tree

Showing 5 changed files with 277 additions and 118 deletions.
diff --git a/development/images/dataHierarchy.png b/development/images/dataHierarchy.png
diff --git a/development/images/dataHierarchy.pptx b/development/images/dataHierarchy.pptx
diff --git a/documentation/Cpacs_doc_project.shfbproj b/documentation/Cpacs_doc_project.shfbproj
@@ -315,6 +315,10 @@
       <ImageId>loadReferenceLine</ImageId>
       <AlternateText>Load reference line</AlternateText>
     </Image>
+    <Image Include="dataHierarchy.png">
+      <ImageId>dataHierarchy</ImageId>
+      <AlternateText>CPACS data hierarchy</AlternateText>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <Image Include="paramamSbot_Thick1.png">

diff --git a/documentation/dataHierarchy.png b/documentation/dataHierarchy.png