merged with master

2019-03-16 18:26:24 +11:00
parent 1889d423af 1d11e31029
commit 88f423fa84
289 changed files with 9643 additions and 7182 deletions
@@ -20,16 +20,16 @@

 #include "audio.h"

-#include "oliveglobal.h"
+#include "global/global.h"

-#include "project/sequence.h"
+#include "timeline/sequence.h"

 #include "panels/panels.h"

-#include "io/config.h"
+#include "global/config.h"
 #include "ui/audiomonitor.h"
 #include "rendering/renderfunctions.h"
-#include "debug.h"
+#include "global/debug.h"

 #include <QApplication>
 #include <QAudioOutput>