diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-03-19 11:28:08 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-03-19 11:28:08 +0200 |
| commit | 06358c97b9fc5e20a25a3035dc4c2f0e0ec8a4c1 (patch) | |
| tree | 49ec106ee521b4b6df5cb96993dd1bec676ae2cc /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj | |
| parent | 7080d6422a5c20b2acd0562fa2d8b3c91ba1590d (diff) | |
| parent | 270559636c37928e6221384a485901380acd6f28 (diff) | |
| download | Tango-06358c97b9fc5e20a25a3035dc4c2f0e0ec8a4c1.tar.gz Tango-06358c97b9fc5e20a25a3035dc4c2f0e0ec8a4c1.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj index c2bdf669c..190e8d0fe 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj @@ -93,6 +93,7 @@ <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs"> <Link>GlobalVersionInfo.cs</Link> </Compile> + <Compile Include="Controls\JobOutlineControl.cs" /> <Compile Include="Converters\BrushStopLabToColorConverter.cs" /> <Compile Include="Converters\BrushStopCMYKToColorConverter.cs" /> <Compile Include="Converters\BrushStopToColorConverter.cs" /> @@ -112,6 +113,7 @@ <Compile Include="Converters\SegmentToBrushConverterMulti.cs" /> <Compile Include="Converters\SegmentToGradientStopsConverterMulti.cs" /> <Compile Include="Converters\SegmentToGradientStopsConverter.cs" /> + <Compile Include="Converters\StringToEllipsisConverter.cs" /> <Compile Include="DeveloperModule.cs" /> <Compile Include="DeveloperModuleSettings.cs" /> <Compile Include="Navigation\DeveloperNavigationManager.cs" /> @@ -337,9 +339,7 @@ <ItemGroup> <Resource Include="Images\black-screen.jpg" /> </ItemGroup> - <ItemGroup> - <Folder Include="Controls\" /> - </ItemGroup> + <ItemGroup /> <ItemGroup> <Resource Include="Images\thread.png" /> </ItemGroup> |