Thomas Müller 98b69bc6c6 Merge branch 'master' of github.com:ppy/osu into SirCmpwn/options-sidebar-tracking ...

# Conflicts:
#	osu.Game/osu.Game.csproj

2016-11-12 12:24:02 +01:00

..

Options

Merge branch 'master' of github.com:ppy/osu into SirCmpwn/options-sidebar-tracking

2016-11-12 12:24:02 +01:00

ChatConsole.cs

Merge branch 'refs/heads/master' into dependency-injection

2016-11-12 20:18:26 +09:00

DragBar.cs

Seperated DragBar class.

2016-10-27 18:14:50 +08:00

MusicController.cs

Merge branch 'refs/heads/master' into dependency-injection

2016-11-12 20:18:26 +09:00

OptionsOverlay.cs

Merge branch 'master' of github.com:ppy/osu into SirCmpwn/options-sidebar-tracking

2016-11-12 12:24:02 +01:00

Toolbar.cs

Merge branch 'refs/heads/master' into dependency-injection

2016-11-12 20:18:26 +09:00

ToolbarButton.cs

Modify toolbar tooltips to be closer to design.

2016-11-09 15:24:19 +09:00

ToolbarModeButton.cs

Merge branch 'refs/heads/master' into dependency-injection

2016-11-12 20:18:26 +09:00

ToolbarModeSelector.cs

Merge branch 'refs/heads/master' into dependency-injection

2016-11-12 20:18:26 +09:00