Merge master.

[dcpomatic.git] / src / wx / timeline_dialog.h

diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index 19a7ffade7adfbc477e2c9b1a925c2478b91c6ad..802aaf245acfedf2576b38c7b456c7d1eb1114c8 100644 (file)
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -27,7 +27,7 @@ class Playlist;
 class TimelineDialog : public wxDialog
 {
 public:
-       TimelineDialog (FilmEditor *, boost::shared_ptr<Film>);
+       TimelineDialog (ContentPanel *, boost::shared_ptr<Film>);
 
 private:
        void snap_toggled ();