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
@@ -84,7 +84,6 @@ SOURCES += \
    ui/comboboxex.cpp \
    ui/colorbutton.cpp \
    dialogs/replaceclipmediadialog.cpp \
-    ui/checkboxex.cpp \
    ui/keyframeview.cpp \
    ui/texteditex.cpp \
    dialogs/demonotice.cpp \
@@ -209,7 +208,6 @@ HEADERS += \
    ui/comboboxex.h \
    ui/colorbutton.h \
    dialogs/replaceclipmediadialog.h \
-    ui/checkboxex.h \
    ui/keyframeview.h \
    ui/texteditex.h \
    dialogs/demonotice.h \