Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 15 Jan 2015 09:40:52 +0000 (09:40 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 15 Jan 2015 09:40:52 +0000 (09:40 +0000)
commit092e773f9e35c230b618bf8a3caa8259473a420b
treead3c14386d47f30ac431a110cd7d5e639028cf00
parentbdac048c25e61be0d94688e399003ae440d79c63
parentce10dd176bc7419334b547ce7e06a8b0eac0fa36
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0