Amish Shah 70b35c85d6 Merge branch 'indev-prism'

2017-02-23 20:19:26 +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 'indev-prism'

2017-02-23 20:19:26 +00:00