Merge master and multifarious hackery.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 6238aadc6ee6c5ff6cbe567abf23e0525912816d..89065c97d9cc5b4401d48c2393fef1b4a098fe2d 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -107,7 +107,6 @@ private:
        void setup_container ();
        void setup_content_sensitivity ();
        void setup_loop_sensitivity ();
-       void setup_content_properties ();
        
        void active_jobs_changed (bool);
        boost::shared_ptr<Content> selected_content ();