Merge branch 'master' into otio

2020-10-22 20:26:16 +11:00
parent 0ec262125c 384650e85a
commit 917738d1de
149 changed files with 4350 additions and 2079 deletions
@@ -25,6 +25,7 @@
 #include <QUrl>

 #include "core.h"
+#include "node/input/media/media.h"

 OLIVE_NAMESPACE_ENTER

@@ -25,6 +25,7 @@

 #include "project.h"
 #include "undo/undocommand.h"
+#include "node/block/block.h"

 OLIVE_NAMESPACE_ENTER