Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
2016-01-18 22:40:33 +01:00
5 changed files with 5 additions and 2 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

+5 -2
View File
@@ -11,7 +11,7 @@
<AssemblyName>YJMPD-UWP</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
<TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
@@ -138,9 +138,12 @@
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
<None Include="YJMPD-UWP_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<Content Include="Assets\4-[Omgezet].png" />
<Content Include="Assets\about-button.png" />
<Content Include="Assets\settings-button.png" />
<Content Include="Assets\start-button2.png" />
<Content Include="Properties\Default.rd.xml" />
<Content Include="Assets\LockScreenLogo.scale-200.png" />
<Content Include="Assets\SplashScreen.scale-200.png" />