diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-05-19 12:07:38 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-05-19 12:07:38 +0300 |
| commit | 5ed1e236bc0db0f1480344d0934cbb42df20df7b (patch) | |
| tree | d242fecf6d74a1af7b00760c1fd23a62fddda1c0 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | db94be7a673886297f5a6dfe4331793452a9f609 (diff) | |
| parent | 1d2d515c91a78a8a3e373e05ae925ba6af1f32fd (diff) | |
| download | Tango-5ed1e236bc0db0f1480344d0934cbb42df20df7b.tar.gz Tango-5ed1e236bc0db0f1480344d0934cbb42df20df7b.zip | |
merge, no change
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 91fdbf3aa..13e2af128 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("4.0.19.0")] +[assembly: AssemblyVersion("4.0.21.0")] [assembly: ComVisible(false)]
\ No newline at end of file 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 ede1bf828..2ca31a671 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 @@ -536,6 +536,14 @@ <Resource Include="Images\settings.png" /> </ItemGroup> <ItemGroup> + <Content Include="..\..\Build\TCC\Debug\Tango.TCC.ColorDetector.dll"> + <Link>Tango.TCC.ColorDetector.dll</Link> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </Content> + <Content Include="..\..\Build\TCC\Debug\Tango.TCC.ColorDetector.pdb"> + <Link>Tango.TCC.ColorDetector.pdb</Link> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </Content> <Resource Include="Images\firmware_upgrade.png" /> <Resource Include="Images\external-bridge-emulator.png" /> <EmbeddedResource Include="..\..\Versioning\ChangeLog.txt"> |