diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-04-26 14:09:47 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-04-26 14:09:47 +0300 |
| commit | 5a01fe2392fd67e413548d46cdfa51e5ae994b85 (patch) | |
| tree | 44a6117c6f333e121ecf5154ae19e688d104c478 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj | |
| parent | b079f2e9ec3f7f514b1a04228d5f7accdb2f9560 (diff) | |
| parent | 2a29f99d015e5c229c8c62356c4aeb482f580a0f (diff) | |
| download | Tango-5a01fe2392fd67e413548d46cdfa51e5ae994b85.tar.gz Tango-5a01fe2392fd67e413548d46cdfa51e5ae994b85.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj index 8ab6bb188..c6afdca4b 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj @@ -161,6 +161,7 @@ <Compile Include="ViewModelLocator.cs" /> <Compile Include="ViewModels\ModuleWindowVM.cs" /> <Compile Include="ViewModels\ReportIssueViewVM.cs" /> + <Compile Include="ViewModels\ResolvedIssuesViewVM.cs" /> <Compile Include="ViewModels\ShutdownViewVM.cs" /> <Compile Include="ViewModels\UpdateViewVM.cs" /> <Compile Include="Views\ConnectedMachineView.xaml.cs"> @@ -190,6 +191,9 @@ <Compile Include="Views\ReportIssueView.xaml.cs"> <DependentUpon>ReportIssueView.xaml</DependentUpon> </Compile> + <Compile Include="Views\ResolvedIssuesView.xaml.cs"> + <DependentUpon>ResolvedIssuesView.xaml</DependentUpon> + </Compile> <Compile Include="Views\ShutdownView.xaml.cs"> <DependentUpon>ShutdownView.xaml</DependentUpon> </Compile> @@ -270,6 +274,10 @@ <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> + <Page Include="Views\ResolvedIssuesView.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> <Page Include="Views\ShutdownView.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> @@ -460,6 +468,7 @@ </ItemGroup> <ItemGroup> <Content Include="Html\HTML Templates\Thread Break.html" /> + <Resource Include="Images\bug-resolved.png" /> <EmbeddedResource Include="TFS\SystemInformationTemplate.cshtml" /> <Resource Include="Images\bug.png" /> </ItemGroup> |