1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 23:07:44 +08:00
osu-lazer/osu.Game/Overlays/Options/Sections/Gameplay
Dean Herbert d05b544d0d
Merge branch 'master' into audio-device-selection
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
2017-02-09 16:21:28 +09:00
..
GeneralOptions.cs Merge branch 'master' into audio-device-selection 2017-02-09 16:21:28 +09:00
SongSelectOptions.cs Update and standardise license headers. 2017-02-07 14:27:41 +09:00