smoogipoo ffbe6f2e37 Merge remote-tracking branch 'origin/master' into fix-rank-status ... # Conflicts: # osu.Game/Beatmaps/RankStatus.cs # osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs # osu.Game/Overlays/Direct/FilterControl.cs # osu.Game/Overlays/DirectOverlay.cs		2018-04-18 14:16:58 +09:00
..
Audio	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Beatmaps	Merge remote-tracking branch 'origin/master' into fix-rank-status	2018-04-18 14:16:58 +09:00
Configuration	Merge remote-tracking branch 'origin/master' into instant-hide-screenshot	2018-04-13 21:13:09 +09:00
Database	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Graphics	Remove unused field	2018-04-16 00:25:09 +09:00
Input	Normalize all the line endings	2018-04-13 18:26:38 +09:00
IO	Normalize all the line endings	2018-04-13 18:26:38 +09:00
IPC	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Migrations	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Online	Merge remote-tracking branch 'origin/master' into fix-rank-status	2018-04-18 14:16:58 +09:00
Overlays	Merge remote-tracking branch 'origin/master' into fix-rank-status	2018-04-18 14:16:58 +09:00
Properties	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Rulesets	Review changes	2018-04-16 14:14:40 +02:00
Screens	Merge branch 'master' into fix-leaderboard-nullref	2018-04-18 12:05:13 +09:00
Skinning	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Storyboards	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Tests	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Users	add badges to ProfileHeader	2018-04-15 23:49:45 +02:00
Utils	Normalize all the line endings	2018-04-13 18:26:38 +09:00
osu!.res
osu.Game.csproj	bump NUnit to version 3.10.1	2018-04-13 13:19:52 +02:00
osu.nuspec
OsuGame.cs	Set Value instead of BindTo	2018-04-15 20:23:57 +02:00
OsuGameBase.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00