Merge commit 'fb023d0546' into dev

This commit is contained in:
Dimitris Panokostas 2017-04-10 18:26:33 +02:00
commit 2fc7853637
10 changed files with 42 additions and 5 deletions

View file

@ -90,6 +90,9 @@
<Image Include="..\data\cpu.ico">
<DeploymentContent>true</DeploymentContent>
</Image>
<Image Include="..\data\cursor.bmp">
<DeploymentContent>true</DeploymentContent>
</Image>
<Image Include="..\data\delete.png">
<DeploymentContent>true</DeploymentContent>
</Image>
@ -134,6 +137,9 @@
<Font Include="..\data\FreeSans.ttf">
<DeploymentContent>true</DeploymentContent>
</Font>
<Font Include="..\data\Topaznew.ttf">
<DeploymentContent>true</DeploymentContent>
</Font>
</ItemGroup>
<ItemGroup>
<None Include="..\Makefile">

View file

@ -128,11 +128,17 @@
<Image Include="..\data\sound.ico">
<Filter>data</Filter>
</Image>
<Image Include="..\data\cursor.bmp">
<Filter>data</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<Font Include="..\data\FreeSans.ttf">
<Filter>data</Filter>
</Font>
<Font Include="..\data\Topaznew.ttf">
<Filter>data</Filter>
</Font>
</ItemGroup>
<ItemGroup>
<None Include="..\Makefile" />