Merge branch 'develop' into clip-refactor-keyframes

This commit is contained in:
FeRD (Frank Dana)
2020-10-19 16:28:49 -04:00
192 changed files with 672 additions and 622 deletions

View File

@@ -30,7 +30,7 @@
* along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "../include/QtTextReader.h"
#include "QtTextReader.h"
#include <QImage>
#include <QPainter>