And one more merge for good measure.

This commit is contained in:
Jason Felds
2011-07-03 13:43:46 -04:00
-1
View File
@@ -835,7 +835,6 @@ IconChoiceEndlessOffCommand=linear,0.1175;zoomx,0
[ScreenGameInformation]
[ScreenSelectMusic]
SampleMusicPreviewMode='SampleMusicPreviewMode_LastSong'
UsePlayerSelectMenu=false
# OptionsMenuAvailable=(getenv(sMode) ~= Oni)
SelectMenuAvailable=true