Merge branch 'hotfix-2.0.0-rc4' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc4

This commit is contained in:
Joe Taylor 2018-11-09 08:31:51 -05:00
commit c2d0d21ae7
2 changed files with 2 additions and 2 deletions

View File

@ -1,6 +1,6 @@
#include "FoxLog.hpp"
#include <String>
#include <QString>
#include <QDateTime>
#include <QSqlDatabase>
#include <QSqlTableModel>

View File

@ -64,7 +64,7 @@
#include "LotWUsers.hpp"
#include "logbook/AD1CCty.hpp"
#include "models/FoxLog.hpp"
#include "FoXLogWindow.hpp"
#include "FoxLogWindow.hpp"
#include "ui_mainwindow.h"
#include "moc_mainwindow.cpp"