Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 4 Dec 2017 21:14:33 +0000 (21:14 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 4 Dec 2017 21:14:33 +0000 (21:14 +0000)
commitd42f7f8e05b33876e45bcc6b58b736f0c2cbfa2f
tree8b4786d84fb732f3ef6ce8e7b905fce4e861394b
parentfe413f8f083338607af12f6c22344f1420b116d4
parent9cad6a1ea3eb15e7c118ac012953fb6d225625fb
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
src/wx/about_dialog.cc