Merge branch 'master' of /home/carl/git/dvdomatic
-rw-r--r-- 262 .gitignore
-rw-r--r-- 17992 COPYING
-rw-r--r-- 26375 ChangeLog
-rw-r--r-- 77269 Doxyfile
-rw-r--r-- 2570 README
-rwxr-xr-x 372 build-all-ffmpeg
-rw-r--r-- 2988 cscript
drwxr-xr-x - debian
drwxr-xr-x - doc
-rw-r--r-- 185 dvdomatic.desktop.in
-rw-r--r-- 213 dvdomatic_batch.desktop.in
drwxr-xr-x - hacks
-rw-r--r-- 1184 i18n.py
drwxr-xr-x - icons
drwxr-xr-x - optimise
drwxr-xr-x - platform
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
-rw-r--r-- 12102 wscript