[splittiming] ...whoops. Double merge.

This commit is contained in:
Jason Felds
2011-05-12 14:00:25 -04:00
2 changed files with 9 additions and 0 deletions
+1
View File
@@ -1,3 +1,4 @@
#include "global.h"
#include "SongPosition.h"
static Preference<float> g_fVisualDelaySeconds( "VisualDelaySeconds", 0.0f );
+8
View File
@@ -1444,6 +1444,14 @@
RelativePath="SongOptions.h"
>
</File>
<File
RelativePath=".\SongPosition.cpp"
>
</File>
<File
RelativePath=".\SongPosition.h"
>
</File>
<File
RelativePath="SongUtil.cpp"
>