EpicKnarvik97 f0fbe6f4a3 Merge remote-tracking branch 'origin/master' ... # Conflicts: # .idea/misc.xml # .idea/workspace.xml # src/ffmpegconverter/Main.java		2020-02-10 22:53:46 +01:00
..
artifacts	Adds hardsubbing of subtitles with same name as video file	2018-11-13 11:33:48 +01:00
codeStyles	Updates to changes done while the server was down	2020-01-20 20:15:19 +01:00
encodings.xml	Adds surround to stereo	2018-12-18 00:55:45 +01:00
FFmpegConvert.iml	Updates to changes done while the server was down	2020-01-20 20:15:19 +01:00
misc.xml	Adds lots of improvements	2020-02-10 22:50:35 +01:00
modules.xml	Updates to changes done while the server was down	2020-01-20 20:15:19 +01:00
vcs.xml	Adds missing files	2018-09-30 00:47:02 +02:00
workspace.xml	Adds lots of improvements	2020-02-10 22:50:35 +01:00