Merge branch 'master' into content-rework-take5
[dcpomatic.git] / ffmpeg-versions
2012-12-21 Carl HetheringtonMerge branch 'video-player' of /home/carl/git/dvdomatic...
2012-12-21 Carl HetheringtonUpdate manual a bit.