Merge branch 'master' into 12bit
authorCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 15:30:11 +0000 (16:30 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 15:30:11 +0000 (16:30 +0100)
1  2 
src/lib/dcp_video_frame.cc
src/lib/image.cc
src/wx/film_viewer.cc

Simple merge
Simple merge
Simple merge