Merge.
authorCarl Hetherington <cth@carlh.net>
Thu, 19 Nov 2015 15:57:42 +0000 (15:57 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 19 Nov 2015 16:00:07 +0000 (16:00 +0000)
commit9394ce6d3b840ec0af141d6435f394a5ad85c2ed
tree18a43033eb9be373f159dfa9509b6940bfde08c8
parentb6a6cda147625ccd09738cd338136ea5911a95e8
Merge.
ChangeLog
src/tools/dcpomatic.cc
src/wx/kdm_dialog.cc
src/wx/self_dkdm_dialog.cc [new file with mode: 0644]
src/wx/self_dkdm_dialog.h [new file with mode: 0644]
src/wx/wscript