Thomas Müller 32ee20b843 Merge branch 'master' of github.com:ppy/osu into better-clocks ... # Conflicts: # osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs		2016-11-06 10:08:24 +01:00
..
Beatmaps	Fix broken tests.	2016-11-05 22:48:32 +09:00
Resources	Fix path not being local enough for some unit tests.	2016-10-25 00:27:47 +09:00
app.config	Make importing work properly.	2016-10-24 11:39:53 -04:00
OpenTK.dll.config	Decode beatmap colours	2016-10-13 12:17:35 +09:00
osu.Game.Tests.csproj	Make use of new timing system in Drawables and Transforms.	2016-11-06 08:25:21 +01:00
packages.config	Merge branch 'master' into song-select	2016-10-26 10:37:18 -04:00