Martijn van Berkel (Flitskikker) 96de5df18c Merge branch 'master' into feature/beautify-timecodes-2023 ... # Conflicts: # src/ui/Forms/Options/Settings.Designer.cs		2023-06-06 21:37:03 +02:00
..
AssaAttachments.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
AssaDraw.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
AssaProperties.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
AssaStyle.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
BeautifyTimeCodes.png	Merge branch 'master' into feature/beautify-timecodes-2023	2023-06-06 21:37:03 +02:00
BurnIn.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
EbuProperties.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
Find.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
FixCommonErrors.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
Help.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
IttProperties.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
Netflix.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
New.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
Open.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
RemoveTextForHI.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
Replace.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
Save.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
SaveAs.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
Settings.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
SourceView.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
SpellCheck.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
VideoToggle.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
VisualSync.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
WaveformToggle.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00
WebVttProperties.png	Add legacy toolbar icons	2023-06-01 16:30:58 +02:00