I think fix_conflicting_settings is now not required.
authorCarl Hetherington <cth@carlh.net>
Wed, 31 Jan 2018 23:55:14 +0000 (23:55 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 31 Jan 2018 23:55:14 +0000 (23:55 +0000)
commitc6c1173589761734608d66cc3a8dff4e06b26147
tree424bcabb0824a4f710a01836b89df3ece537146b
parent4b3554db5556f8745ff36c5ca80423aaa41ae506
I think fix_conflicting_settings is now not required.
src/lib/film.cc
src/lib/film.h
src/wx/film_editor.cc