projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 1.0
[dcpomatic.git]
/
src
/
wx
/
film_editor.cc
diff --git
a/src/wx/film_editor.cc
b/src/wx/film_editor.cc
index 04bf6d2a809c10334b4a2b13b165d67fe6d52e2b..1818fb451452233c196c534a7f996827d7a3b27d 100644
(file)
--- a/
src/wx/film_editor.cc
+++ b/
src/wx/film_editor.cc
@@
-936,7
+936,7
@@
FilmEditor::content_timeline_clicked ()
_timeline_dialog = 0;
}
- _timeline_dialog = new TimelineDialog (this, _film);
+ _timeline_dialog = new
DCP
TimelineDialog (this, _film);
_timeline_dialog->Show ();
}