diff --git a/.hgignore b/.hgignore index 2b9724952e..8d030eedf2 100644 --- a/.hgignore +++ b/.hgignore @@ -50,3 +50,6 @@ crashinfo.txt syntax: regexp .*\#.*\#$ glob:Cache/Banners/AdditionalSongs_Airspace Preview_Derailed_Derailed bn.png + +syntax: regexp +Songs/.+/ diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index 178717c95a..2a8a86ed48 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -5607,6 +5607,7 @@ isa = PBXProject; buildConfigurationList = AAC845130856A19700A9FEAB /* Build configuration list for PBXProject "stepmania" */; compatibilityVersion = "Xcode 3.0"; + developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( English, diff --git a/src/NotesLoaderSSC.cpp b/src/NotesLoaderSSC.cpp index b4be9ce8d2..fe5e1b3102 100644 --- a/src/NotesLoaderSSC.cpp +++ b/src/NotesLoaderSSC.cpp @@ -668,7 +668,7 @@ bool SSCLoader::LoadFromSSCFile( const RString &sPath, Song &out, bool bFromCach pNewNotes->SetCredit( sParams[1] ); } - else if( sValueName=="NOTES" ) + else if( sValueName=="NOTES" || sValueName=="NOTES2" ) { state = GETTING_SONG_INFO; //pNewNotes->m_Timing = out.m_Timing;