Dean Herbert f0681f35c4 Merge remote-tracking branch 'refs/remotes/upstream/master' into game-modes-layout ... # Conflicts: # osu.Game/OsuGame.cs # osu.Game/OsuGameBase.cs # osu.Game/osu.Game.csproj		2016-10-01 17:10:27 +09:00
..
Beatmaps	Use the old naming style for now.	2016-09-26 15:07:29 +09:00
Configuration	Add minimum resolution settings.	2016-09-01 22:47:48 +09:00
GameModes	Merge remote-tracking branch 'refs/remotes/upstream/master' into game-modes-layout	2016-10-01 17:10:27 +09:00
Graphics	Merge remote-tracking branch 'refs/remotes/upstream/master' into game-modes-layout	2016-10-01 17:10:27 +09:00
Online	Merge remote-tracking branch 'upstream/master' into api-channels-messages	2016-09-29 23:54:33 +09:00
Overlays	Add template toolbar.	2016-09-30 18:45:27 +09:00
Properties	License -> Licence.	2016-08-26 17:27:49 +09:00
Users	Add basic class structure for Beatmap/HitObject/SampleInfo/User.	2016-09-06 21:41:16 +09:00
osu.Game.csproj	Merge remote-tracking branch 'refs/remotes/upstream/master' into game-modes-layout	2016-10-01 17:10:27 +09:00
OsuGame.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into game-modes-layout	2016-10-01 17:10:27 +09:00
OsuGameBase.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into game-modes-layout	2016-10-01 17:10:27 +09:00
packages.config	Update nuget packages and framework reference once more.	2016-09-06 20:41:18 +09:00