76b3335263
# Conflicts: # XplorePlane/App.xaml.cs # XplorePlane/Themes/Generic.xaml # XplorePlane/ViewModels/Main/MainViewModel.cs # XplorePlane/Views/Main/MainWindow.xaml # XplorePlane/Views/Main/ViewportPanelView.xaml