Dean Herbert 3e4cd0dc7c Merge remote-tracking branch 'upstream/master' into less-mods-enum ... # Conflicts: # osu.Game.Modes.Mania/ManiaMod.cs # osu.Game.Modes.Osu/OsuMod.cs # osu.Game/Modes/Mod.cs		2017-03-07 13:42:50 +09:00
..
AssistedSection.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
DifficultyIncreaseSection.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
DifficultyReductionSection.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
ModButton.cs	Merge remote-tracking branch 'upstream/master' into less-mods-enum	2017-03-07 13:42:50 +09:00
ModSection.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
ModSelectOverlay.cs	Don't use Mods enum for handling incompatible mods.	2017-03-06 18:29:17 +09:00