merged with master

2019-03-21 17:22:36 +11:00
parent 262e93460f 1da4a315f8
commit dd06230c04
46 changed files with 943 additions and 320 deletions
@@ -44,7 +44,6 @@
 #include "panels/timeline.h"
 #include "panels/effectcontrols.h"
 #include "panels/grapheditor.h"
-#include "ui/checkboxex.h"
 #include "global/debug.h"
 #include "global/path.h"
 #include "ui/mainwindow.h"