Merge branch 'master' into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 26 Apr 2013 22:50:43 +0000 (23:50 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 26 Apr 2013 22:50:43 +0000 (23:50 +0100)
commit28dbf4fd074d2046a3c8ddebac9a537a80fd457a
treee2bed7c7aed8c74969f1a25d7bdf948815b4b057
parentf861018389acd9d277fe34d7621182b9b54f977f
parent87a709a4ea5dffaadaf35ef94edb4b578eb3b56c
Merge branch 'master' into 1.0
src/tools/dcpomatic.cc
src/wx/wx_util.cc