Dean Herbert cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection ... # Conflicts: # osu-framework # osu.Game/GameModes/OsuGameMode.cs # osu.Game/GameModes/Play/Player.cs # osu.Game/OsuGame.cs # osu.Game/Overlays/MusicController.cs # osu.Game/Overlays/Options/EditorSection.cs # osu.Game/Overlays/Options/Input/MouseOptions.cs # osu.Game/Overlays/Options/Online/InGameChatOptions.cs # osu.Game/Overlays/Options/SkinSection.cs		2016-11-12 20:18:26 +09:00
..
API	Fix regressions with HitRenderers, while also cleaning them up.	2016-10-13 10:10:15 +09:00
Chat	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
User.cs	Add back basic API support for channel/message retrieval.	2016-09-27 18:33:52 +09:00