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
..
Background	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Components	Add basic class structure for Beatmap/HitObject/SampleInfo/User.	2016-09-06 21:41:16 +09:00
Containers	Update to latest DI stuff	2016-11-10 17:40:42 -05:00
Cursor	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Processing	Use DrawSize instead of Size whereever Size was previously read due to framework changes.	2016-10-18 18:53:31 +02:00
UserInterface	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
TextAwesome.cs	Update FontAwesome definitions.	2016-11-07 17:59:00 +09:00