Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 29 Jan 2015 20:02:56 +0000 (20:02 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 29 Jan 2015 20:02:56 +0000 (20:02 +0000)
commitbfe277e664a03ec47cd6bee7e1b1e4aca6eb38e6
tree6bdc6fa07f2cde0565c4025ab552f2c0fc9c3b2f
parent6a0da4eb43fc684c0f54a7a3a817a31dc8db7109
parent27867be66579551018c926ed3339624e463c1b08
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0