Martijn van Berkel (Flitskikker) 6da91dd424 Merge branch 'master' into feature/beautify-timecodes-2023 ... # Conflicts: # src/ui/Forms/BatchConvert.Designer.cs # src/ui/Forms/Main.Designer.cs # src/ui/Forms/Main.resx # src/ui/Forms/Ocr/VobSubOcr.Designer.cs # src/ui/Forms/Options/Settings.Designer.cs		2023-07-12 21:35:16 +02:00
..
Black	Merge branch 'master' into feature/beautify-timecodes-2023	2023-07-12 21:35:16 +02:00
DarkTheme	Merge branch 'master' into feature/beautify-timecodes-2023	2023-07-12 21:35:16 +02:00
DefaultTheme	Merge branch 'master' into feature/beautify-timecodes-2023	2023-07-12 21:35:16 +02:00
Legacy	Merge branch 'master' into feature/beautify-timecodes-2023	2023-07-12 21:35:16 +02:00
ass.ico	Work on file type icons/installer	2021-12-22 18:08:01 +01:00
dfxp.ico	Work on file type icons/installer	2021-12-22 18:08:01 +01:00
itt.ico	Work on file type icons/installer	2021-12-22 18:08:01 +01:00
sbv.ico	Work on file type icons/installer	2021-12-22 18:08:01 +01:00
smi.ico	Work on file type icons/installer	2021-12-22 18:08:01 +01:00
srt.ico	Work on file type icons/installer	2021-12-22 18:08:01 +01:00
ssa.ico	Work on file type icons/installer	2021-12-22 18:08:01 +01:00
stl.ico	Work on file type icons/installer	2021-12-22 18:08:01 +01:00
sub.ico	Work on file type icons/installer	2021-12-22 18:08:01 +01:00
sup.ico	Work on file type icons/installer	2021-12-22 18:08:01 +01:00
vtt.ico	Work on file type icons/installer	2021-12-22 18:08:01 +01:00