diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-03-28 15:41:26 +0200 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-03-28 15:41:26 +0200 |
| commit | 652ba187110a48e5a7887ece87d12b04e4eb8105 (patch) | |
| tree | 60f4841b0b38c574c3c284e45becaad43387e129 /Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj | |
| parent | 624f0125aa598d78ae9ea4797b3fdc6fbf77c55a (diff) | |
| parent | 924699be4aa943430937ed8cc45b7dae49030000 (diff) | |
| download | Tango-652ba187110a48e5a7887ece87d12b04e4eb8105.tar.gz Tango-652ba187110a48e5a7887ece87d12b04e4eb8105.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj')
| -rw-r--r-- | Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj index a98e1a848..5dde283e0 100644 --- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj +++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj @@ -117,6 +117,10 @@ <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> + <Page Include="Themes\ComboboxStyle.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> <Page Include="Themes\DarkThemesColors.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> @@ -145,6 +149,10 @@ <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> + <Page Include="Themes\TreeViewItem.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs"> @@ -202,5 +210,11 @@ <ItemGroup> <Resource Include="Images\SaveAll_16x.png" /> </ItemGroup> + <ItemGroup> + <Resource Include="Images\NewFileCollection_16x.png" /> + </ItemGroup> + <ItemGroup> + <Resource Include="Images\OpenFolder_16x.png" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> </Project>
\ No newline at end of file |