aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-09-25 18:36:12 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-09-25 18:36:12 +0300
commit60186d68fdbb9c3cc1a6f83c12228db90b48488d (patch)
treeb1e0b8f45ac25af28c15882b60587ba8e225cee0 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
parente6febb2cda232a2c89467690d9e1fbb82423618a (diff)
parent051e3ca3f4039ec0d23408d9940b90bde1b4e857 (diff)
downloadTango-60186d68fdbb9c3cc1a6f83c12228db90b48488d.tar.gz
Tango-60186d68fdbb9c3cc1a6f83c12228db90b48488d.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_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>