Dean Herbert 16a01abc4d Merge remote-tracking branch 'upstream/master' into options-refactor ... # Conflicts: # osu.Game/Beatmaps/Drawables/BeatmapPanel.cs # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/KeyCounter.cs		2017-02-03 13:16:07 +09:00
..
Drawables	Merge remote-tracking branch 'upstream/master' into options-refactor	2017-02-03 13:16:07 +09:00
Events	Add missing licence headers.	2016-12-06 19:07:15 +09:00
Formats	Merge pull request #266 from kizayoi/master	2017-01-16 16:02:22 +08:00
IO	Add missing licence headers.	2016-12-06 19:07:15 +09:00
Samples	Add basic osu! hit object parsing	2016-10-13 12:17:08 +09:00
Timing	Add basic ControlPoint parsing.	2016-11-28 15:12:11 +09:00
Beatmap.cs	Move BPM calculations to Beatmap.	2017-01-30 16:03:45 +09:00
WorkingBeatmap.cs	Fix some nullrefs when running visualtests with no maps loaded.	2017-01-27 00:16:02 +09:00