Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Mon, 6 Jul 2015 19:42:12 +0000 (20:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 6 Jul 2015 19:42:12 +0000 (20:42 +0100)
commit43877eccbedc0950ab253e76dd0cea691fd7a4b0
tree8b2e1b6d54a07d12b2842bd1c6a362b8e8b22c6d
parent3b970d4c3089bbf7ca2c7f59d8d18142ed49de65
parent52fba4ddf170de2e073d1c4736b9407bad525290
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
src/lib/config.cc
src/lib/config.h
src/lib/kdm.cc
src/wx/config_dialog.cc