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)
1  2 
src/wx/about_dialog.cc

Simple merge