Damnae 2c245f4c22 Merge branch 'master' into storyboard_integration ... # Conflicts: # osu.Game/Configuration/OsuConfigManager.cs # osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs		2017-09-22 12:45:34 +02:00
..
OsuConfigManager.cs	Merge branch 'master' into storyboard_integration	2017-09-22 12:45:34 +02:00
RankingType.cs	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
ReleaseStream.cs	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
ScoreMeterType.cs	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
ScreenshotFormat.cs	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
SelectionRandomType.cs	Changed default selection type and added suggestions from PR feedback	2017-06-01 08:54:48 +02:00