Hand-apply 62f8054d65a8bd31689fc0c977c1bb2385e71afa from master; config of encryption...
authorCarl Hetherington <cth@carlh.net>
Wed, 29 Apr 2015 21:53:52 +0000 (22:53 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 29 Apr 2015 21:53:52 +0000 (22:53 +0100)
commita85c82137ec26124ebefccb4aeebb96a3cdb8a4c
treec1ab1cdc808198f9bec49553bb62c6f209887467
parentd7c6347a250f618d5070d1264677010c8026d927
Hand-apply 62f8054d65a8bd31689fc0c977c1bb2385e71afa from master; config of encryption key.
ChangeLog
TO_PORT
src/lib/film.cc
src/lib/film.h
src/wx/dcp_panel.cc
src/wx/dcp_panel.h
src/wx/key_dialog.cc [new file with mode: 0644]
src/wx/key_dialog.h [new file with mode: 0644]
src/wx/timeline.cc
src/wx/wscript