Dean Herbert 12d2102a88 Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Modes/UI/HudOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj		2017-04-07 09:22:18 +09:00
..
Dialog	Fix filename mismatch.	2017-04-06 16:05:41 +08:00
Mods	Update bindables.	2017-04-04 11:34:13 +09:00
Notifications	Some minor improvements.	2017-04-06 09:57:34 +09:00
Options	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Toolbar	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
ChatOverlay.cs	Update references.	2017-03-28 21:26:20 +09:00
DialogOverlay.cs	Update references.	2017-03-28 21:26:20 +09:00
DragBar.cs	Merge branch 'master' into song-progress-graph	2017-03-23 17:44:22 +09:00
LoginOverlay.cs	Update references.	2017-03-28 21:26:20 +09:00
MusicController.cs	Update bindables.	2017-04-04 11:34:13 +09:00
NotificationManager.cs	Update references.	2017-03-28 21:26:20 +09:00
OptionsOverlay.cs	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
WaveOverlayContainer.cs	Update references.	2017-03-28 21:26:20 +09:00