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,16 +1,18 @@
#include "tracexyplot.h"
#include <QGridLayout>
#include "trace.h"
#include <cmath>
#include <QFrame>
#include "CustomWidgets/informationbox.h"
#include "Marker/marker.h"
#include "xyplotaxisdialog.h"
#include <preferences.h>
#include <QPainter>
#include "Util/util.h"
#include "unit.h"
#include "preferences.h"
#include <QGridLayout>
#include <cmath>
#include <QFrame>
#include <QPainter>
#include <QDebug>
#include "CustomWidgets/informationbox.h"
#include <QFileDialog>
using namespace std;