[splittiming] ...whoops. Double merge.
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
|
#include "global.h"
|
||||||
#include "SongPosition.h"
|
#include "SongPosition.h"
|
||||||
|
|
||||||
static Preference<float> g_fVisualDelaySeconds( "VisualDelaySeconds", 0.0f );
|
static Preference<float> g_fVisualDelaySeconds( "VisualDelaySeconds", 0.0f );
|
||||||
|
|||||||
@@ -1444,6 +1444,14 @@
|
|||||||
RelativePath="SongOptions.h"
|
RelativePath="SongOptions.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\SongPosition.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\SongPosition.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="SongUtil.cpp"
|
RelativePath="SongUtil.cpp"
|
||||||
>
|
>
|
||||||
|
|||||||
Reference in New Issue
Block a user