Dean Herbert 58ed5c00e4 Merge remote-tracking branch 'refs/remotes/upstream/master' into beatmap_framework ... # Conflicts: # osu.Game/GameModes/Menu/ButtonSystem.cs # osu.Game/OsuGame.cs		2016-09-25 13:40:06 +09:00
..
Components	Add basic class structure for Beatmap/HitObject/SampleInfo/User.	2016-09-06 21:41:16 +09:00
Containers	License -> Licence.	2016-08-26 17:27:49 +09:00
Processing	Update to latest framework version.	2016-09-11 03:04:47 +09:00
TextAwesome.cs	Add basic implementation of VisualTest framework for osu! project.	2016-09-24 15:47:17 +09:00