1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-29 10:52:54 +08:00
osu-lazer/osu.Desktop.VisualTests
smoogipooo 854212a7aa Merge branch 'master' into beatmap_parsing
Conflicts:
	osu.Desktop.VisualTests/app.config
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Mania/app.config
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Osu/app.config
	osu.Game.Modes.Taiko/TaikoRuleset.cs
	osu.Game/Modes/Ruleset.cs
	osu.Game/app.config
	osu.Game/osu.Game.csproj
2017-03-14 13:39:19 +09:00
..
Platform Fix most warnings. 2017-03-07 13:05:57 +09:00
Tests Merge branch 'master' into beatmap_parsing 2017-03-14 13:39:19 +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 Use AutoGenerateBindingRedirects instead of explicit app.config. 2017-03-14 03:20:33 +08:00
packages.config Add license headers. 2017-03-14 13:02:42 +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