Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into develop

Conflicts:
	Vocaluxe/Vocaluxe.csproj
This commit is contained in:
lukeIam committed 2015-01-18 20:56:55 +01:00
commit f60e0ac762
1 file changed
+16 -1
+16 -1
View File
@@ -359,21 +359,36 @@
<SubType>Designer</SubType>
</None>
<None Include="Doc\SQLite.NET.chm" />
<Content Include="Website\locales\cs.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Website\locales\de.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Website\locales\en.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Website\locales\cs.json">
<Content Include="Website\locales\es.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Website\locales\fr.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Website\locales\it.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Website\locales\nl.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Website\locales\pt.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Website\locales\sv.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Website\locales\tr.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="Doc\Roadmap.txt" />