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
..
Backgrounds	Fix incorrect triangle density on first display.	2017-03-03 18:09:16 +09:00
Components	…
Containers	Weld -> BindWith.	2017-02-27 12:24:53 +09:00
Cursor	Fix CursorTrail corruption by resetting on load.	2017-03-02 16:08:10 +09:00
Processing	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Sprites	Implement notifications.	2017-02-10 16:30:23 +09:00
UserInterface	Disallow copying from OsuPasswordTextBox.	2017-03-03 10:00:39 +08:00
OsuColour.cs	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
TextAwesome.cs	Merge https://github.com/ppy/osu into mod-overlay	2017-02-28 02:22:59 -04:00