Merge branch 'develop' into song-loading-speedup
This commit is contained in:
2 files changed
+3
-2
No files matched your search
@@ -261,7 +261,7 @@
|
||||
<Text Name="TextTitle">
|
||||
<X>60</X>
|
||||
<Y>50</Y>
|
||||
<Z>0</Z>
|
||||
<Z>-1</Z>
|
||||
<H>27</H>
|
||||
<MaxW>0</MaxW>
|
||||
<Color Name="TextColor" />
|
||||
@@ -275,7 +275,7 @@
|
||||
<Text Name="TextSong">
|
||||
<X>640</X>
|
||||
<Y>50</Y>
|
||||
<Z>0</Z>
|
||||
<Z>-1</Z>
|
||||
<H>27</H>
|
||||
<MaxW>0</MaxW>
|
||||
<Color Name="TextColor" />
|
||||
|
||||
@@ -152,6 +152,7 @@ Global
|
||||
{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|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.Build.0 = Debug|x64
|
||||
{8EDF4429-251A-416D-BB68-93F227191BCF}.DebugLinux|x86.ActiveCfg = Debug|x86
|
||||
|
||||
Reference in new issue
Block a user