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
..
Components	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Lounge	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
Match	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
Play	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
Ranking	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Header.cs	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
IMultiplayerSubScreen.cs	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
IRoomManager.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Multiplayer.cs	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
MultiplayerSubScreen.cs	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
RoomBindings.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
RoomManager.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00