smoogipoo 91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen ... # Conflicts: # osu.Game/Screens/Multi/Match/MatchSubScreen.cs # osu.Game/Screens/Multi/Multiplayer.cs # osu.Game/Screens/Multi/MultiplayerSubScreen.cs # osu.Game/Screens/OsuScreen.cs # osu.Game/osu.Game.csproj # osu.sln		2019-01-29 21:21:36 +09:00
..
Break	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
HUD	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
PlayerSettings	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
BreakOverlay.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
FailOverlay.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
GameplayMenuOverlay.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
HotkeyRetryOverlay.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
HUDOverlay.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
KeyCounter.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
KeyCounterAction.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
KeyCounterCollection.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
KeyCounterKeyboard.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
KeyCounterMouse.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
KeyCounterState.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
PauseContainer.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Player.cs	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
PlayerLoader.cs	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
ReplayPlayer.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
ScreenWithBeatmapBackground.cs	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
SkipOverlay.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
SoloResults.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
SongProgress.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
SongProgressBar.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
SongProgressGraph.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
SongProgressInfo.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
SquareGraph.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00