aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-10-03 10:04:11 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-10-03 10:04:11 +0300
commit2ccc5a2e78f306d3c434c764e34509d4db92d8d8 (patch)
tree399f8c061fa698c36d06da9ebc101d65b02df26e /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
parentb9e2c008322ce474ce6e0b18da9a786c128de8d9 (diff)
parenta6496a02892d653a70bc9e0d37856b1a7d3cd74b (diff)
downloadTango-2ccc5a2e78f306d3c434c764e34509d4db92d8d8.tar.gz
Tango-2ccc5a2e78f306d3c434c764e34509d4db92d8d8.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 7acb4c806..1f748fe9f 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
@@ -58,6 +58,9 @@
<TabItem Header="COLOR CALIBRATION">
<local:ColorCalibrationView/>
</TabItem>
+ <TabItem Header="HW CONFIGURATION">
+ <local:HardwareConfigurationView/>
+ </TabItem>
</TabControl>
</Grid>
</DockPanel>