Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 10 May 2015 01:49:17 +0000 (02:49 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 10 May 2015 01:49:17 +0000 (02:49 +0100)
commit41a2ba154e60f03da08b28e7273776e7bfe9dbe0
treeca82982f190a8950eb56d67efbfb922a1afb00ee
parent989d8622ffa3287af860574e71bb033ad6215686
parent480ea356805a201dcbcdf02005a4e4d0bcc8f694
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0