Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Florian Küpper committed 2014-12-21 12:45:02 +01:00
2 parents ec791c100e 76859942b8
commit a199d7fba3
63 files changed
+1587 -1411
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Ambient/Screens/ScreenSong.xml
+5 -5
View File
@@ -1021,7 +1021,7 @@
<TextColor Name="TextColor" />
<TextSelColor Name="TextSelColor" />
<TextH>25</TextH>
<TextRelativeX>0</TextRelativeX>
<TextRelativeX>50</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>280</TextMaxW>
<TextFont>Outline</TextFont>
@@ -1063,7 +1063,7 @@
<TextColor Name="TextColor" />
<TextSelColor Name="TextSelColor" />
<TextH>25</TextH>
<TextRelativeX>0</TextRelativeX>
<TextRelativeX>50</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>280</TextMaxW>
<TextFont>Outline</TextFont>
@@ -1105,7 +1105,7 @@
<TextColor Name="TextColor" />
<TextSelColor Name="TextSelColor" />
<TextH>25</TextH>
<TextRelativeX>0</TextRelativeX>
<TextRelativeX>50</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>280</TextMaxW>
<TextFont>Outline</TextFont>
@@ -1147,7 +1147,7 @@
<TextColor Name="TextColor" />
<TextSelColor Name="TextSelColor" />
<TextH>25</TextH>
<TextRelativeX>0</TextRelativeX>
<TextRelativeX>50</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>280</TextMaxW>
<TextFont>Outline</TextFont>
@@ -1354,7 +1354,7 @@
<Text />
</Text>
</ButtonPlaylistSing>
<SelectSlideGameMode>
<SelectSlideGameMode Name="SelectSlideGameMode">
<Skin>Button</Skin>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>