Dean Herbert c5d23daa6b Merge remote-tracking branch 'upstream/master' into remove-dragbar ... # Conflicts: # osu.Game/Overlays/DragBar.cs		2017-07-18 13:44:23 +09:00
..
Audio	Simplify constructor of SampleInfoList.	2017-05-08 19:30:55 +08:00
Beatmaps	Merge branch 'master' into drawable-room-update	2017-07-14 15:29:27 +09:00
Configuration	More Clean UP	2017-06-07 20:07:18 +08:00
Database	Merge branch 'master' into fix-track-rotation	2017-07-14 19:25:54 +10:00
Graphics	Prefer ScrollTo in SectionsContainer.	2017-07-14 22:56:27 +08:00
Input/Handlers	Update framework	2017-05-11 21:25:43 +09:00
IO	Remove unused namespace.	2017-05-16 22:20:05 +08:00
IPC
Online	Merge branch 'master' into profile	2017-07-14 22:52:19 +08:00
Overlays	Merge remote-tracking branch 'upstream/master' into remove-dragbar	2017-07-18 13:44:23 +09:00
Properties	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Rulesets	Merge remote-tracking branch 'upstream/master' into ruleset-settings	2017-07-13 15:35:53 +09:00
Screens	Merge remote-tracking branch 'upstream/master' into remove-dragbar	2017-07-18 13:44:23 +09:00
Users	Merge branch 'master' into profile	2017-07-14 22:52:19 +08:00
osu.Game.csproj	Merge remote-tracking branch 'upstream/master' into remove-dragbar	2017-07-18 13:44:23 +09:00
OsuGame.cs	Merge branch 'master' into profile	2017-07-14 22:52:19 +08:00
OsuGameBase.cs	Use tooltip and context menu containers as newly required	2017-07-06 15:15:12 +03:00
packages.config	Update nuget packages	2017-06-13 11:50:46 +09:00