Dean Herbert 9e1383fa48 Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Game.Modes.Catch/CatchRuleset.cs # osu.Game.Modes.Mania/ManiaRuleset.cs # osu.Game.Modes.Taiko/TaikoRuleset.cs # osu.Game/Screens/Play/Player.cs		2017-03-04 13:17:01 +09:00
..
Objects	Fix some license headers.	2017-03-02 18:45:20 +09:00
UI	Merge remote-tracking branch 'upstream/master' into replay	2017-03-04 13:17:01 +09:00
Mod.cs	Replace missing perfect icon with cross.	2017-03-02 20:29:48 +09:00
PlayMode.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Ruleset.cs	Merge remote-tracking branch 'upstream/master' into replay	2017-03-04 13:17:01 +09:00
Score.cs	Fix some license headers.	2017-03-02 18:45:20 +09:00
ScoreProcesssor.cs	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00