minenice55 e8975c6dc4 fix all merge conflicts ... unfortunately we lost a good chunk of git history in the process so that may hurt the ability for this to get merged, may have to consult everyone else for this		2022-08-09 11:23:17 -04:00
..
LayerLabel.cs	start gearing up for track 5	2022-07-28 00:17:02 -05:00
LayerLabel.cs.meta	Tram&Pauline	2022-07-25 01:04:16 -07:00
TempoTimeline.cs	Tram&Pauline	2022-07-25 01:04:16 -07:00
TempoTimeline.cs.meta	Tempo change? (Don't update very buggy)	2022-01-27 21:50:57 -05:00
TempoTimelineObj.cs	Tram&Pauline	2022-07-25 01:04:16 -07:00
TempoTimelineObj.cs.meta	Tempo change? (Don't update very buggy)	2022-01-27 21:50:57 -05:00
Timeline.cs	fix all merge conflicts	2022-08-09 11:23:17 -04:00
Timeline.cs.meta	Tempo change? (Don't update very buggy)	2022-01-27 21:50:57 -05:00
TimelineEventObj.cs	fix all merge conflicts	2022-08-09 11:23:17 -04:00
TimelineEventObj.cs.meta	Tempo change? (Don't update very buggy)	2022-01-27 21:50:57 -05:00
VolumeTimeline.cs	Tram&Pauline	2022-07-25 01:04:16 -07:00
VolumeTimeline.cs.meta	Editor: Music volume!	2022-03-19 05:46:38 -07:00
VolumeTimelineObj.cs	Tram&Pauline	2022-07-25 01:04:16 -07:00
VolumeTimelineObj.cs.meta	Tram&Pauline	2022-07-25 01:04:16 -07:00