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

..

KeyboardOptions.cs

Update and standardise license headers.

2017-02-07 14:27:41 +09:00

MouseOptions.cs

Merge branch 'master' into audio-device-selection

2017-02-09 16:21:28 +09:00

OtherInputOptions.cs

Update and standardise license headers.

2017-02-07 14:27:41 +09:00