merge from some old revision (forgot to commit)

2011-09-09 08:58:01 +07:00
parent d17c21e091 df937f766a
commit 9baffbc9e3
52 changed files with 429 additions and 173 deletions
@@ -54,9 +54,11 @@ bool NotesLoader::LoadFromDir( const RString &sPath, Song &out, set<RString> &Bl
 	BMSLoader::GetApplicableFiles( sPath, list );
 	if( !list.empty() )
 		return BMSLoader::LoadFromDir( sPath, out );
+	/*
 	PMSLoader::GetApplicableFiles( sPath, list );
 	if( !list.empty() )
 		return PMSLoader::LoadFromDir( sPath, out );
+	*/
 	KSFLoader::GetApplicableFiles( sPath, list );
 	if( !list.empty() )
 		return KSFLoader::LoadFromDir( sPath, out );