Thomas Müller d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor ...

# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs

2017-03-01 18:05:58 +01:00

..

Notifications

Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor

2017-03-01 18:05:58 +01:00

Options

Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor

2017-03-01 18:05:58 +01:00

Pause

Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor

2017-03-01 18:05:58 +01:00

Toolbar

Update References to FlowStrategies

2017-02-27 16:55:55 +01:00

ChatOverlay.cs

Removed unused variables and parameters

2017-02-27 17:32:32 +03:00

DragBar.cs

Update and standardise license headers.

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

LoginOverlay.cs

Update framework

2017-02-26 11:22:58 +09:00

MusicController.cs

Removed unused variables and parameters

2017-02-27 17:32:32 +03:00

NotificationManager.cs

Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor

2017-03-01 18:05:58 +01:00

OptionsOverlay.cs

Update References to FlowStrategies

2017-02-27 16:55:55 +01:00