Don't fail to build when we're on a merge commit.
[dcpomatic.git] / doc /
drwxr-xr-x   ..
drwxr-xr-x - design
-rw-r--r-- 1558 mainpage.txt
drwxr-xr-x - manual