Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 10 Sep 2014 22:30:31 +0000 (23:30 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 10 Sep 2014 22:30:31 +0000 (23:30 +0100)
commit6de35d058821acc092d2aae75543024a97026b8a
tree0e01be0a7caa77c62193b6497b4fe5939ce9d18d
parentb80b1aee7fc6561bc53edb10ee5e37d752db80c3
parente01961397fbf87c69da4c8a8e79cef3c16480d3a
Merge master.
ChangeLog
run/dcpomatic
src/wx/config_dialog.cc