smoogipoo 73465c35fa Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics ...

# Conflicts:
#	osu.Game/Beatmaps/Beatmap.cs

2018-05-11 14:05:40 +09:00

..

Backgrounds

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Charts

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Direct

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Edit

Fix beatmap/ruleset being changeable while in the editor

2018-05-07 16:32:15 +09:00

Menu

Rename OriginalBeatmap back to Beatmap

2018-05-07 10:29:38 +09:00

Multiplayer

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Play

Rename OriginalBeatmap back to Beatmap

2018-05-07 10:29:38 +09:00

Ranking

Rename OriginalBeatmap back to Beatmap

2018-05-07 10:29:38 +09:00

Select

Make BeatmapInfoWedge display properly for converts

2018-05-07 15:51:08 +09:00

Tournament

Normalize all the line endings

2018-04-13 18:26:38 +09:00

BackgroundScreen.cs

Merge remote-tracking branch 'upstream/master' into peppy-async-screens

2018-04-20 16:52:58 +09:00

Loader.cs

Normalize all the line endings

2018-04-13 18:26:38 +09:00

OsuScreen.cs

Normalize all the line endings

2018-04-13 18:26:38 +09:00

ScreenWhiteBox.cs

Normalize all the line endings

2018-04-13 18:26:38 +09:00