projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge TO_PORT.
[dcpomatic.git]
/
src
/
wx
/
content_sub_panel.cc
diff --git
a/src/wx/content_sub_panel.cc
b/src/wx/content_sub_panel.cc
index f0962cc24c07b4a7ae3d0fbe3da5aee0894dfca8..7ea17c15cf15c3f9de5929116737163dbf1c18e0 100644
(file)
--- a/
src/wx/content_sub_panel.cc
+++ b/
src/wx/content_sub_panel.cc
@@
-19,7
+19,7
@@
#include <wx/notebook.h>
#include "content_sub_panel.h"
-#include "
film_editor
.h"
+#include "
content_panel
.h"
using boost::shared_ptr;