Merge 1.0 in.
authorCarl Hetherington <cth@carlh.net>
Tue, 17 Sep 2013 22:39:05 +0000 (23:39 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 17 Sep 2013 22:39:05 +0000 (23:39 +0100)
commit373f010a7f04add1f49169cbaa60cb7ae5f508d4
treea61fe014cbefc775dcf3a5c9a45d06e391e65b31
parent048f9b6b5569f03d1342a04f75c83a2bad340996
parente888e92f354b9868337b0b022ff9be38b9c36c0f
Merge 1.0 in.
13 files changed:
src/lib/config.cc
src/lib/config.h
src/lib/exceptions.h
src/lib/film.cc
src/lib/film.h
src/lib/util.cc
src/tools/dcpomatic.cc
src/wx/cinema_dialog.cc
src/wx/film_editor.cc
src/wx/film_editor.h
src/wx/kdm_dialog.cc
src/wx/screen_dialog.cc
src/wx/wscript