h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 03:02:53 +08:00
Code Issues Releases Wiki Activity
420ed08119
osu-lazer/osu.Game/Overlays/Options/Online
History
Dean Herbert cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection 
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
2016-11-12 20:18:26 +09:00
..
InGameChatOptions.cs Merge branch 'refs/heads/master' into dependency-injection 2016-11-12 20:18:26 +09:00
NotificationsOptions.cs Merge branch 'refs/heads/master' into dependency-injection 2016-11-12 20:18:26 +09:00
OnlineIntegrationOptions.cs Merge branch 'refs/heads/master' into dependency-injection 2016-11-12 20:18:26 +09:00
OnlineSection.cs Add expanding options sidebar 2016-11-08 23:36:06 -05:00
PrivacyOptions.cs Merge branch 'refs/heads/master' into dependency-injection 2016-11-12 20:18:26 +09:00