w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-19 22:28:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ft9_refactor' into feat-refactor

Browse Source 
# Conflicts:
#	CMakeLists.txt
#	lib/ft4/getcandidates4.f90
#	lib/ft4/sync4d.f90
This commit is contained in:
sirhc808
2019-07-02 12:06:14 -05:00
parent 857afbe500 af64533363
commit 27d4471cde
60 changed files with 377 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widgets/mainwindow.cpp
+5 -5
View File
@@ -42,11 +42,11 @@
#include "revision_utils.hpp"
#include "qt_helpers.hpp"
#include "NetworkAccessManager.hpp"
#include "Network/NetworkAccessManager.hpp"
#include "soundout.h"
#include "soundin.h"
#include "Modulator.hpp"
#include "Detector.hpp"
#include "Detector/Detector.hpp"
#include "plotter.h"
#include "echoplot.h"
#include "echograph.h"
@@ -61,10 +61,10 @@
#include "decodedtext.h"
#include "Radio.hpp"
#include "models/Bands.hpp"
#include "TransceiverFactory.hpp"
#include "Transceiver/TransceiverFactory.hpp"
#include "models/StationList.hpp"
#include "validators/LiveFrequencyValidator.hpp"
#include "MessageClient.hpp"
#include "Network/MessageClient.hpp"
#include "wsprnet.h"
#include "signalmeter.h"
#include "HelpTextWindow.hpp"
@@ -73,7 +73,7 @@
#include "MultiSettings.hpp"
#include "validators/MaidenheadLocatorValidator.hpp"
#include "validators/CallsignValidator.hpp"
#include "EqualizationToolsDialog.hpp"
#include "Transceiver/EqualizationToolsDialog.hpp"
#include "LotWUsers.hpp"
#include "logbook/AD1CCty.hpp"
#include "models/FoxLog.hpp"