Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 21 Jul 2015 23:15:29 +0000 (00:15 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 21 Jul 2015 23:15:29 +0000 (00:15 +0100)
commitf73077d310016077041f7707c688f7eaaa2303d7
tree293cf27c47cd84e6ea5652dc15d2e28f750ffa67
parentbe793fb568c713a2e7aa1f703e69bfb553886b91
parentba4c91fcb19f69f9e8ac55ab5914edc7c94dbb1f
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
ChangeLog