mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-11-23 19:52:48 +01:00
b16cdec6eb
# Conflicts: # libse/SubtitleFormats/TimedText10.cs # src/Forms/Main.cs # src/Forms/Main.resx # src/Forms/Settings.Designer.cs |
||
---|---|---|
.. | ||
AssemblyInfo.cs.template | ||
Resources.Designer.cs | ||
Resources.resx |