aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-08-26 10:37:38 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-08-26 10:37:38 +0300
commite6704dce7a2b7f6d5f9bbf1b8374cc7f00ea061e (patch)
treee405f333819560543274119432dd01667d850b77 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
parent9f112324a1196bffd1660122285aafc2aff63219 (diff)
parentf98cac2d6e331eaf62167d63524134d53db921ef (diff)
downloadTango-e6704dce7a2b7f6d5f9bbf1b8374cc7f00ea061e.tar.gz
Tango-e6704dce7a2b7f6d5f9bbf1b8374cc7f00ea061e.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index a7348d869..68cd65ad4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -575,7 +575,7 @@
<Grid Grid.Row="1">
- <controls:NavigationControl x:Name="TransitionControl" TransitionType="Slide" KeepElementsAttached="True">
+ <controls:NavigationControl x:Name="NavigationControl" TransitionType="Slide" KeepElementsAttached="True">
<local:MachineJobSelectionView controls:NavigationControl.NavigationName="MachineJobSelectionView" />
<local:JobView controls:NavigationControl.NavigationName="JobView" />
<local:RunningJobView controls:NavigationControl.NavigationName="RunningJobView" />