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

Conflicts:
	Output/Languages/Swedish.xml
This commit is contained in:
Florian Küpper committed 2016-12-20 15:18:39 +01:00
commit f2b0fb7f6a
47 files changed
+476 -152

No files matched your search

@@ -187,7 +187,7 @@
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>1)</Text>
<Text />
</Text>
<Text Name="TextRoundPlayer">
<X>0</X>