Amish Shah 8a2ec437e5 Merge branch 'master' into indev-prism		2017-02-22 20:37:59 +00:00
..
faq.md	Add ffmpeg-binaries as a possible source of ffmpeg (#975)	2016-12-11 19:02:00 +00:00
updating.md	Add a little more info	2016-12-30 16:42:51 -05:00
welcome.md	Merge branch 'master' into indev-prism	2017-02-22 20:37:59 +00:00