Merge branch 'master' into wx
-rw-r--r-- 172 .gitignore
-rw-r--r-- 17992 COPYING
-rw-r--r-- 3019 ChangeLog
-rw-r--r-- 72320 Doxyfile
-rw-r--r-- 2165 README
-rw-r--r-- 3025 TODO
-rwxr-xr-x 594 build-windows
drwxr-xr-x - doc
-rw-r--r-- 185 dvdomatic.desktop.in
drwxr-xr-x - hacks
drwxr-xr-x - icons
-rwxr-xr-x 880 rebuild-windows
drwxr-xr-x - run
-rwxr-xr-x 588 splitchapters
drwxr-xr-x - src
drwxr-xr-x - test
-rwxr-xr-x 87683 waf
drwxr-xr-x - windows
-rw-r--r-- 7193 wscript