Merge branch 'pull-requests'

This commit is contained in:
Jan Käberich 2021-10-25 21:09:15 +02:00
commit 4bead8bcb2
112 changed files with 386 additions and 246 deletions

View file

@ -1,14 +1,15 @@
#include "traceplot.h"
#include "Marker/marker.h"
#include "preferences.h"
#include <QPainter>
#include <QPainterPath>
#include <QMimeData>
#include <QDebug>
#include "unit.h"
#include "Marker/markermodel.h"
#include "preferences.h"
#include "Util/util.h"
#include <QPainter>
#include <QMimeData>
#include <QDebug>
std::set<TracePlot*> TracePlot::plots;
using namespace std;