projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '1.0' into 1.0-seek
[dcpomatic.git]
/
src
/
wx
/
film_editor.cc
diff --git
a/src/wx/film_editor.cc
b/src/wx/film_editor.cc
index cd159189cc15a3a909324998205f94b2594049dd..e5cb5371c533c62ed755bc736199150ef41d1847 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 ();
}