Dean Herbert e0c06a4f19 Merge branch 'refs/heads/general-fixes' into beatmap_framework ... # Conflicts: # osu-framework # osu.Game/GameModes/FieldTest.cs # osu.Game/GameModes/FontTest.cs # osu.Game/GameModes/Menu/ButtonSystem.cs # osu.Game/Graphics/UserInterface/TextBox.cs # osu.Game/OsuGame.cs # osu.Game/osu.Game.csproj		2016-09-20 16:36:42 +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	License -> Licence.	2016-08-26 17:27:49 +09:00