Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 9 Dec 2016 21:51:36 +0000 (21:51 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 9 Dec 2016 21:51:36 +0000 (21:51 +0000)
commit936ff6927ad24daf0ed20776b19b6faa3df9bf83
tree556123d229c916251ddc96f9a8b3164b4d815e9b
parentd7013785f7a1d86feb471af826419afa6298e2b8
parent5757f3ba9d2cf3948bcad2b3f3ddbbf09ad754a5
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
src/wx/about_dialog.cc