Dean Herbert 3a4150c6c3 Merge remote-tracking branch 'upstream/master' into profile ...

# Conflicts:
#	osu.Game/Graphics/Containers/SectionsContainer.cs

2017-07-13 13:44:21 +09:00

..

Audio

Simplify constructor of SampleInfoList.

2017-05-08 19:30:55 +08:00

Beatmaps

Update framework

2017-07-12 11:06:13 +09:00

Configuration

More Clean UP

2017-06-07 20:07:18 +08:00

Database

Rename 2X resources to be defaults

2017-07-13 10:27:39 +09:00

Graphics

Merge remote-tracking branch 'upstream/master' into profile

2017-07-13 13:44:21 +09: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

Enforce readonly private members where possible.

2017-03-23 13:50:08 +09:00

Online

Merge remote-tracking branch 'upstream/master' into profile

2017-07-13 13:44:21 +09:00

Overlays

Merge remote-tracking branch 'upstream/master' into profile

2017-07-13 13:44:21 +09:00

Properties

Remove all trailing whitespaces in this repo.

2017-04-06 16:21:18 +08:00

Rulesets

Remove unnecessary using statements

2017-07-12 12:55:52 +09:00

Screens

Rename 2X resources to be defaults

2017-07-13 10:27:39 +09:00

Users

Merge branch 'master' into profile.

2017-07-10 10:36:23 +08:00

osu.Game.csproj

Merge remote-tracking branch 'upstream/master' into profile

2017-07-13 13:44:21 +09:00

OsuGame.cs

Merge remote-tracking branch 'upstream/master' into profile

2017-07-13 13:44:21 +09: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