Merge branch 'prefs' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic into prefs
authorCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 00:14:49 +0000 (00:14 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 00:14:49 +0000 (00:14 +0000)
commit48b2c7b8ec57e72f2f27d5080e54e4b3c3fcda3d
treeb6fe5ffc718f658682e12d79e1384066d52bd91b
parent0556fc92a74293dcbeaf8b871ba0078b6b6a2d9a
parent2b7a21d1250423e5abc3b9e8fc912fb60bf7bf04
Merge branch 'prefs' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic into prefs