Merge.
authorCarl Hetherington <cth@carlh.net>
Tue, 7 Mar 2017 10:18:31 +0000 (10:18 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 7 Mar 2017 10:18:31 +0000 (10:18 +0000)
commite340b96b4a33725e70e3703b0c60ba8da95bca3b
treebddbe1231a7417f872d19c9bf77e500db45bb0d0
parent443a7d74ff2a49ad45a4fb44f92abd619bc0a0b0
parente4d7f575fab50b6d255821d6d6a8171c8e1f13f6
Merge.
ChangeLog
src/lib/config.cc
src/lib/config.h
src/tools/dcpomatic.cc