mirror of
https://github.com/ppy/osu.git
synced 2025-01-16 12:53:07 +08:00
854212a7aa
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 |
||
---|---|---|
.. | ||
Beatmaps | ||
Mods | ||
Objects | ||
Properties | ||
UI | ||
CatchDifficultyCalculator.cs | ||
CatchRuleset.cs | ||
OpenTK.dll.config | ||
osu.Game.Modes.Catch.csproj | ||
packages.config |