Roman Kapustin 376e76e00d Resolve merge conflicts		2018-11-18 16:10:36 +03:00
..
Beatmaps	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 18:10:22 +09:00
Chat	Normalize all the line endings	2018-04-13 18:26:38 +09:00
NonVisual	Fix up performance calculators	2018-06-14 16:04:48 +09:00
Resources	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 18:10:22 +09:00
ScrollAlgorithms	Add IScrollAlgorithm.TimeAt()	2018-11-12 17:43:22 +09:00
Visual	Resolve merge conflicts	2018-11-18 16:10:36 +03:00
osu.Game.Tests.csproj	Update framework and other dependencies	2018-11-05 18:22:16 +09:00
WaveformTestBeatmap.cs	Use existing instance of beatmap rather than adding more resources	2018-06-17 19:00:58 +09:00