diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-25 16:56:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-25 16:56:17 +0100 |
| commit | 7b2054e2a73844450b5b55c5788c02af671812ce (patch) | |
| tree | 5d5727a5bce89cdd32923c0c44841abd0585c8cb /src/wx/film_editor.h | |
| parent | c497e601934e82425efef5dc981b12818a881990 (diff) | |
| parent | 7edf8e601ed2ede5b6758840fb9d8940393cf7e2 (diff) | |
Merge master.
Diffstat (limited to 'src/wx/film_editor.h')
| -rw-r--r-- | src/wx/film_editor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h index 28baf410c..a198d7aa7 100644 --- a/src/wx/film_editor.h +++ b/src/wx/film_editor.h @@ -38,7 +38,7 @@ class DCPPanel; class FilmEditor : public wxPanel { public: - FilmEditor (boost::shared_ptr<Film>, wxWindow *); + FilmEditor (wxWindow *); void set_film (boost::shared_ptr<Film>); |