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

Merge branch 'develop' into song-loading-speedup

Browse Source
This commit is contained in:
Florian Küpper authored and GitHub committed 2018-10-23 09:29:26 +02:00
2 parents 70be8f4d94 025331ba83
commit e0aa178294
2 files changed
+3 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Genius/Screens/ScreenScore.xml
+2 -2
View File
@@ -261,7 +261,7 @@
<Text Name="TextTitle"> <Text Name="TextTitle">
<X>60</X> <X>60</X>
<Y>50</Y> <Y>50</Y>
<Z>0</Z> <Z>-1</Z>
<H>27</H> <H>27</H>
<MaxW>0</MaxW> <MaxW>0</MaxW>
<Color Name="TextColor" /> <Color Name="TextColor" />
@@ -275,7 +275,7 @@
<Text Name="TextSong"> <Text Name="TextSong">
<X>640</X> <X>640</X>
<Y>50</Y> <Y>50</Y>
<Z>0</Z> <Z>-1</Z>
<H>27</H> <H>27</H>
<MaxW>0</MaxW> <MaxW>0</MaxW>
<Color Name="TextColor" /> <Color Name="TextColor" />
Vocaluxe.sln
+1
View File
@@ -152,6 +152,7 @@ Global
{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x64.ActiveCfg = Release|x64 {54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x64.ActiveCfg = Release|x64
{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x64.Build.0 = Release|x64 {54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x64.Build.0 = Release|x64
{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x86.ActiveCfg = Release|Win32 {54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x86.ActiveCfg = Release|Win32
{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x86.Build.0 = Release|Win32
{8EDF4429-251A-416D-BB68-93F227191BCF}.DebugLinux|x64.ActiveCfg = Debug|x64 {8EDF4429-251A-416D-BB68-93F227191BCF}.DebugLinux|x64.ActiveCfg = Debug|x64
{8EDF4429-251A-416D-BB68-93F227191BCF}.DebugLinux|x64.Build.0 = Debug|x64 {8EDF4429-251A-416D-BB68-93F227191BCF}.DebugLinux|x64.Build.0 = Debug|x64
{8EDF4429-251A-416D-BB68-93F227191BCF}.DebugLinux|x86.ActiveCfg = Debug|x86 {8EDF4429-251A-416D-BB68-93F227191BCF}.DebugLinux|x86.ActiveCfg = Debug|x86