Thomas Müller 1198705a6f Merge branch 'master' of github.com:ppy/osu into general-fixes ... # Conflicts: # osu.Game/Beatmaps/Beatmap.cs		2017-02-17 21:22:34 +01:00
..
Drawables	Update framework.	2017-02-13 17:46:50 +09:00
Events	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Formats	Load beatmap data from an optional osb file.	2017-02-09 15:19:09 +01:00
IO	Remove unnecessary methods and local variables.	2017-02-13 18:30:51 +09:00
Samples	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Timing	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Beatmap.cs	Merge branch 'master' of github.com:ppy/osu into general-fixes	2017-02-17 21:22:34 +01:00
WorkingBeatmap.cs	Remove unnecessary methods and local variables.	2017-02-13 18:30:51 +09:00