Thomas Müller 2cd8f6b30c Merge branch 'master' of github.com:ppy/osu into better-transforms ... # Conflicts: # osu-framework		2017-07-21 11:15:26 +02:00
..
Button.cs	Try different formatting style	2017-07-16 18:28:20 +03:00
ButtonSystem.cs	Ensure toolbar disappears when osu logo transition is cancelled	2017-07-18 17:09:53 +03:00
Disclaimer.cs	Get rid of raw AddDelay calls within osu.Game	2017-07-17 16:51:21 +03:00
FlowContainerWithOrigin.cs	Update sorting comparers in line with framework changes	2017-07-11 21:21:58 +03:00
Intro.cs	Centralise TrackManager.AddItem logic to avoid duplicate adds	2017-07-20 17:46:33 +09:00
LogoVisualisation.cs	Fix broken test case	2017-07-19 18:48:27 +09:00
MainMenu.cs	Small optimization to the main menu intro seeking.	2017-07-20 17:15:39 +02:00
MenuSideFlashes.cs	Try different formatting style	2017-07-16 18:28:20 +03:00
OsuLogo.cs	Merge branch 'master' of github.com:ppy/osu into better-transforms	2017-07-19 19:15:51 +02:00