Merge branch 'master' into content-rework-take5
-rw-r--r-- 313 .gitignore
-rw-r--r-- 17992 COPYING
-rw-r--r-- 23645 ChangeLog
-rw-r--r-- 77269 Doxyfile
-rw-r--r-- 124 NOTES
-rw-r--r-- 2395 README
-rw-r--r-- 308 branch-notes
-rwxr-xr-x 372 build-all-ffmpeg
drwxr-xr-x - builds
-rw-r--r-- 2308 cscript
-rw-r--r-- 185 dcpomatic.desktop.in
drwxr-xr-x - debian
drwxr-xr-x - doc
-rw-r--r-- 46 ffmpeg-versions
-rw-r--r-- 1184 i18n.py
drwxr-xr-x - icons
drwxr-xr-x - optimise
drwxr-xr-x - run
-rwxr-xr-x 588 splitchapters
drwxr-xr-x - src
drwxr-xr-x - test
-rw-r--r-- 961 version-test.py
-rw-r--r-- 2206 version.py
-rwxr-xr-x 87683 waf
drwxr-xr-x - windows
-rw-r--r-- 13409 wscript