aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-03-06 13:36:17 +0200
committerShlomo Hecht <shlomo@twine-s.com>2019-03-06 13:36:17 +0200
commit20df5917530e27ae8ead5bf2c35d2dbcad6669ae (patch)
tree679d2e9eaac132494304a4dd71590f24276b266d /Software/Visual_Studio/PPC/Modules/Tango.PPC.Events
parentc2b14d371de9a97c4ced81fc7d79ba6617b75457 (diff)
parentd95329065734fec34e0e3763cf4b6dee428499d2 (diff)
downloadTango-20df5917530e27ae8ead5bf2c35d2dbcad6669ae.tar.gz
Tango-20df5917530e27ae8ead5bf2c35d2dbcad6669ae.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Events')
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsModule.cs2
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Images/events.pngbin0 -> 379 bytes
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Tango.PPC.Events.csproj5
3 files changed, 5 insertions, 2 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsModule.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsModule.cs
index e1e5c93ec..0ad826546 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsModule.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsModule.cs
@@ -47,7 +47,7 @@ namespace Tango.PPC.Events
{
get
{
- return ResourceHelper.GetImageFromResources("Images/events-module.png");
+ return ResourceHelper.GetImageFromResources("Images/events.png");
}
}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Images/events.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Images/events.png
new file mode 100644
index 000000000..53a767f8e
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Images/events.png
Binary files differ
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Tango.PPC.Events.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Tango.PPC.Events.csproj
index fa7583e85..815223834 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Tango.PPC.Events.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Tango.PPC.Events.csproj
@@ -164,10 +164,13 @@
<ItemGroup>
<Resource Include="Images\event_demo.png" />
</ItemGroup>
+ <ItemGroup>
+ <Resource Include="Images\events.png" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
- <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+ <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
</VisualStudio>
</ProjectExtensions>
</Project> \ No newline at end of file