smoogipooo 75ed7406e4 Merge remote-tracking branch 'origin/master' into refactor_hitrenderer ...

Conflicts:
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Taiko/TaikoRuleset.cs

2017-03-11 14:22:59 +09:00

..

Platform

Fix most warnings.

2017-03-07 13:05:57 +09:00

Tests

Merge remote-tracking branch 'origin/master' into refactor_hitrenderer

2017-03-11 14:22:59 +09:00

app.config

Update license headers.

2017-03-08 15:50:52 +09:00

Benchmark.cs

Removed unused variables and parameters

2017-02-27 17:32:32 +03:00

OpenTK.dll.config

Add/update license headers.

2017-02-14 18:17:35 +09:00

osu.Desktop.VisualTests.csproj

Merge remote-tracking branch 'upstream/master' into replay

2017-03-04 13:17:01 +09:00

packages.config

Update license headers.

2017-03-08 15:50:52 +09:00

Program.cs

Update with framework structural changes.

2017-02-26 20:54:32 +09:00

VisualTestGame.cs

Fix most warnings.

2017-03-07 13:05:57 +09:00