fuck merging

This commit is contained in:
AJ Kelly
2011-07-19 19:45:17 -05:00
+1 -1
View File
@@ -590,7 +590,7 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant
} }
else if ( sValueName=="TICKCOUNT" ) else if ( sValueName=="TICKCOUNT" )
{ {
//ProcessTickcounts(sParams[1], iTickCount, out.m_SongTiming); ProcessTickcounts(sParams[1], iTickCount, out.m_SongTiming);
} }
else if ( sValueName=="STEP" ) else if ( sValueName=="STEP" )
{ {