From ee697f7a3350d0a97bddee4de3a2ae4f9d285052 Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Wed, 2 May 2018 17:36:54 +0300
Subject: merge

---
 .../Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj      | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index e4a2720b9..ac6f84618 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -89,6 +89,7 @@
       <DependentUpon>RealTimeGraphControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\TableGrid.cs" />
+    <Compile Include="Converters\PermissionToVisibilityConverter.cs" />
     <Compile Include="Converters\SecondsToGraphPointsConverter.cs" />
     <Compile Include="Diagnostics\DefaultDiagnosticsFrameProvider.cs" />
     <Compile Include="Diagnostics\IDiagnosticsFrameProvider.cs" />
@@ -287,5 +288,8 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="MarkupExtensions\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
-- 
cgit v1.3.1