smoogipoo 208273f16a Merge branch 'timeshift' ... # Conflicts: # osu.Game/osu.Game.csproj		2018-12-13 17:06:20 +09:00
..
Carousel	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Details	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Filter	Use consistent terminology format	2018-09-15 07:30:11 -07:00
Leaderboards	Fix post-rebase errors	2018-11-30 18:46:47 +09:00
Options	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
BeatmapCarousel.cs	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
BeatmapDeleteDialog.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
BeatmapDetailArea.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
BeatmapDetailAreaTabControl.cs	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
BeatmapDetails.cs	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
BeatmapInfoWedge.cs	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
EditSongSelect.cs	Fix player getting loaded when exiting song select	2018-05-30 15:48:20 +09:00
FilterControl.cs	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
FilterCriteria.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Footer.cs	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
FooterButton.cs	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
ImportFromStablePopup.cs	Offer to import skins on first startup	2018-09-03 10:10:39 +09:00
MatchSongSelect.cs	Renamespace	2018-12-10 19:27:25 +09:00
PlaySongSelect.cs	Move a lot more of PlaySongSelect into SongSelect	2018-12-12 13:21:44 +09:00
SongSelect.cs	Move a lot more of PlaySongSelect into SongSelect	2018-12-12 13:21:44 +09:00
WedgeBackground.cs	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00