Dean Herbert 798bc1306b Merge remote-tracking branch 'upstream/master' into m2307-master ...

# Conflicts:
#	osu.Game/Screens/Select/SongSelect.cs

2019-03-01 10:08:35 +09:00

..

Carousel

Fix remaining issues

2019-02-28 13:31:40 +09:00

Details

Merge branch 'master' into more-inspections

2019-02-28 14:32:57 +09:00

Filter

Fix remaining issues

2019-02-28 13:31:40 +09:00

Leaderboards

Merge remote-tracking branch 'upstream/master' into m2307-master

2019-03-01 10:08:35 +09:00

Options

Use expression body for property get/set where possible

2019-02-28 13:58:19 +09:00

BeatmapCarousel.cs

Fix remaining issues

2019-02-28 13:31:40 +09:00

BeatmapClearScoresDialog.cs

Fix code formatting issues

2019-03-01 09:49:36 +09:00

BeatmapDeleteDialog.cs

Update licence header (and remove year)

2019-01-24 17:43:03 +09:00

BeatmapDetailArea.cs

Merge branch 'master' into more-inspections

2019-02-28 14:32:57 +09:00

BeatmapDetailAreaTabControl.cs

Update variable names

2019-02-22 17:51:39 +09:00

BeatmapDetails.cs

Merge branch 'master' into more-inspections

2019-02-28 14:32:57 +09:00

BeatmapInfoWedge.cs

Revert some more instances of 'e' variable names

2019-02-22 20:15:25 +09:00

EditSongSelect.cs

Merge remote-tracking branch 'origin/master' into iscreen

2019-01-29 21:21:36 +09:00

FilterControl.cs

Use expression body for property get/set where possible

2019-02-28 13:58:19 +09:00

FilterCriteria.cs

Use expression body for property get/set where possible

2019-02-28 13:58:19 +09:00

Footer.cs

Update licence header (and remove year)

2019-01-24 17:43:03 +09:00

FooterButton.cs

Merge branch 'master' into more-inspections

2019-02-28 14:32:57 +09:00

ImportFromStablePopup.cs

Update licence header (and remove year)

2019-01-24 17:43:03 +09:00

MatchSongSelect.cs

private + renaming

2019-02-28 17:02:45 +09:00

PlaySongSelect.cs

Fix remaining issues

2019-02-28 13:31:40 +09:00

SongSelect.cs

Merge remote-tracking branch 'upstream/master' into m2307-master

2019-03-01 10:08:35 +09:00

WedgeBackground.cs

Update licence header (and remove year)

2019-01-24 17:43:03 +09:00