Michael Delpach 85fdab3c56 Revert "Merge branch 'master' of https://github.com/ShareX/ShareX" ... This reverts commit 2903ca1082, reversing changes made to 195c0f2f8a.		2020-07-06 06:27:50 +08:00
..
Forms	PT-PT Language	2020-04-30 00:45:09 +01:00
Properties	Revert "Merge branch 'master' of https://github.com/ShareX/ShareX"	2020-07-06 06:27:50 +08:00
DirectShowDevices.cs	Update year	2020-02-05 10:19:48 +03:00
Enums.cs	Update year	2020-02-05 10:19:48 +03:00
FFmpegCLIManager.cs	fixed #4705: Fix video thumbnailer issues introduced in latest version	2020-04-09 19:22:55 +03:00
FFmpegDownloader.cs	Revert "Merge branch 'master' into tweaks"	2020-06-29 06:10:21 +08:00
ImageCombinerOptions.cs	fixed #4655: Added image alignment option to image combiner tool	2020-03-23 23:44:50 +03:00
ShareX.MediaLib.csproj	Revert "Merge branch 'master' of https://github.com/ShareX/ShareX"	2020-07-06 06:27:50 +08:00
ShareX.MediaLib.csproj.DotSettings	Added missing hard coded strings to resx, Updated Turkish translations	2015-08-11 20:33:30 +03:00
VideoConverterOptions.cs	Update year	2020-02-05 10:19:48 +03:00
VideoInfo.cs	Update year	2020-02-05 10:19:48 +03:00
VideoThumbnailer.cs	Revert "Merge branch 'master' into tweaks"	2020-06-29 06:10:21 +08:00
VideoThumbnailInfo.cs	Update year	2020-02-05 10:19:48 +03:00
VideoThumbnailOptions.cs	Update year	2020-02-05 10:19:48 +03:00