diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-02 21:29:06 -0500 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-02 21:29:06 -0500 |
| commit | bbdad2a40d8f02fe738830d9cf66ad4ec2fa86cf (patch) | |
| tree | 8e8892d24684f005b0e18624677957791e1738b7 /include/text_file_functions.h | |
| parent | 1e2d71fb96ca85fa50c172c2f1cf22b2620bacd2 (diff) | |
| parent | 992c0b14e155059a7e22ad72c0309b620c850a46 (diff) | |
Merge branch '2.7-rc'
Includes full code reformat.
# Conflicts:
# src/aomusicplayer.cpp
# src/path_functions.cpp
Diffstat (limited to 'include/text_file_functions.h')
| -rw-r--r-- | include/text_file_functions.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/text_file_functions.h b/include/text_file_functions.h index 119f38e..1da4d92 100644 --- a/include/text_file_functions.h +++ b/include/text_file_functions.h @@ -3,11 +3,11 @@ #include "aoapplication.h" #include "file_functions.h" -#include <QTextStream> -#include <QStringList> -#include <QVector> -#include <QDebug> #include <QColor> +#include <QDebug> #include <QSettings> +#include <QStringList> +#include <QTextStream> +#include <QVector> #endif // TEXT_FILE_FUNCTIONS_H |