Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 00:26:04 +0000 (00:26 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 00:26:04 +0000 (00:26 +0000)
commitbfb33feb40c5b014e9eae3958b1ecb8161f1d090
treeb191a383b22233c395aabe03f7d8f745a99821fc
parentac265d3d008328b9bdaf00c39ebcd86f263605c7
parent6e72e1d36f23a4236c4677f22792a6a4590943a3
Merge master.
src/mxf.h
src/signer.cc
src/stereo_picture_frame.h
wscript