Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Sat, 9 Aug 2014 11:35:24 +0000 (12:35 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 9 Aug 2014 11:35:24 +0000 (12:35 +0100)
commit78f59a6e520c3a402f99f7c84dd3f47dff29e875
tree8a341480f168d9c4eab751085ec64742c04fd99b
parentdef56b185c86001e306c1bdc6e72c67b04500ddb
parent1db078beaf869b03ca235e25e13faaadabdb1f3b
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
ChangeLog