Dean Herbert d05b544d0d Merge branch 'master' into audio-device-selection ... # Conflicts: # osu-framework # osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs		2017-02-09 16:21:28 +09:00
..
Volume	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
BackButton.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
LoadingAnimation.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Nub.cs	Use CircularContainer for nub (bumps framework).	2017-02-08 17:21:17 +09:00
OsuButton.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
OsuCheckbox.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
OsuDropDownHeader.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
OsuDropDownMenu.cs	Merge branch 'master' into audio-device-selection	2017-02-09 16:21:28 +09:00
OsuDropDownMenuItem.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
OsuPasswordTextBox.cs	Password masking character animation.	2017-02-08 16:01:58 +09:00
OsuSliderBar.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
OsuTextBox.cs	Use new placeholder logic.	2017-02-08 14:08:01 +09:00
PercentageCounter.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
RollingCounter.cs	Naming standardisation and enforcing.	2017-02-07 16:20:36 +09:00
ScoreCounter.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
StarCounter.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
TwoLayerButton.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00