ShareX/ScreenCaptureLib/Screencast
mcored c123d56861 Merge branch 'master' of https://github.com/ShareX/ShareX
Conflicts:
	ScreenCaptureLib/Screencast/FFmpegOptionsForm.Designer.cs
2014-05-14 20:14:39 +08:00
..
AVICache.cs License updated 2014-05-13 12:06:40 +03:00
AVIOptions.cs License updated 2014-05-13 12:06:40 +03:00
AviWriter.cs License updated 2014-05-13 12:06:40 +03:00
FFmpegHelper.cs FFmpeg error will show in msgbox 2014-05-13 12:49:34 +03:00
FFmpegOptions.cs FFmpeg options form changes 2014-05-14 15:08:51 +03:00
FFmpegOptionsForm.cs Merge branch 'master' of https://github.com/ShareX/ShareX 2014-05-14 20:14:39 +08:00
FFmpegOptionsForm.Designer.cs Updated FFmpeg tooltip 2014-05-14 20:11:49 +08:00
FFmpegOptionsForm.resx FFmpeg options form changes 2014-05-14 15:08:51 +03:00
HardDiskCache.cs License updated 2014-05-13 12:06:40 +03:00
ImageCache.cs License updated 2014-05-13 12:06:40 +03:00
ScreencastOptions.cs FFmpeg options form changes 2014-05-14 15:08:51 +03:00
ScreenRecorder.cs License updated 2014-05-13 12:06:40 +03:00