Merge remote-tracking branch 'origin/master' into scripting

This commit is contained in:
Marcus Huderle
2020-05-08 11:35:58 -05:00
7 changed files with 65 additions and 28 deletions

View File

@@ -10,6 +10,7 @@
#include "currentselectedmetatilespixmapitem.h"
#include "customattributestable.h"
#include "scripting.h"
#include "adjustingstackedwidget.h"
#include <QFileDialog>
#include <QDirIterator>