Merge branch 'develop' into move-magick-code

This commit is contained in:
Frank Dana
2021-11-10 23:26:27 -05:00
committed by GitHub
86 changed files with 968 additions and 3291 deletions

View File

@@ -15,10 +15,11 @@
#include "MagickUtilities.h"
#include "QtUtilities.h"
#include "Exceptions.h"
#include "Frame.h"
#include "ImageWriter.h"
#include "Exceptions.h"
#include "Frame.h"
#include "ZmqLogger.h"
using namespace openshot;