mirror of https://github.com/ppy/osu
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 | ||
Configuration | ||
Database | ||
Graphics | ||
IO/Legacy | ||
IPC | ||
Input | ||
Modes | ||
Online | ||
Overlays | ||
Properties | ||
Screens | ||
Users | ||
OsuGame.cs | ||
OsuGameBase.cs | ||
osu.Game.csproj | ||
packages.config |