smoogipoo 70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs # osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs # osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs		2018-10-16 17:28:16 +09:00
..
Tools	Re-implement composition tools + implement placement masks	2018-10-03 16:27:26 +09:00
Types	Remove more unnecessary changes	2018-07-19 18:25:28 +09:00
EditRulesetContainer.cs	Fix selection masks not being added for new objects	2018-10-03 16:49:59 +09:00
HitObjectComposer.cs	Merge remote-tracking branch 'origin/master' into editor-mask-placement	2018-10-16 17:28:16 +09:00
PlacementMask.cs	Set hitobject placement time manually	2018-10-10 15:32:59 +09:00
SelectionMask.cs	Rename HitObjectMask -> SelectionMask	2018-10-03 13:28:00 +09:00
ToolboxGroup.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00