aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
diff options
context:
space:
mode:
authorShai Frieder <Shai.Frieder@twine-s.com>2019-12-15 17:45:04 +0200
committerShai Frieder <Shai.Frieder@twine-s.com>2019-12-15 17:45:04 +0200
commit886a476b862f573be5b38036edfe9582946ebe1d (patch)
treeb6103fda927a5f8cfede9640fb51f1ce2abb3cb0 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
parent65220384b09029ea1e672c119b6731a666261a21 (diff)
parent24292197223caf2ffa1a771c38b2e2f7418ad03e (diff)
downloadTango-886a476b862f573be5b38036edfe9582946ebe1d.tar.gz
Tango-886a476b862f573be5b38036edfe9582946ebe1d.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
index 666a4ee4a..bcca83ca5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
@@ -64,6 +64,9 @@
<TabItem Header="UPDATES">
<local:MachineUpdatesView/>
</TabItem>
+ <TabItem Header="TUP">
+ <local:TupView/>
+ </TabItem>
</TabControl>
</Grid>
</DockPanel>