Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 25 Aug 2014 15:56:17 +0000 (16:56 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 25 Aug 2014 15:56:17 +0000 (16:56 +0100)
commit7b2054e2a73844450b5b55c5788c02af671812ce
tree5d5727a5bce89cdd32923c0c44841abd0585c8cb
parentc497e601934e82425efef5dc981b12818a881990
parent7edf8e601ed2ede5b6758840fb9d8940393cf7e2
Merge master.
ChangeLog
src/lib/config.cc
src/lib/config.h
src/lib/util.h
src/tools/dcpomatic.cc
src/wx/film_editor.cc
src/wx/film_editor.h
src/wx/film_viewer.cc
src/wx/film_viewer.h