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 /Attorney_Online.pro | |
| 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 'Attorney_Online.pro')
| -rw-r--r-- | Attorney_Online.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Attorney_Online.pro b/Attorney_Online.pro index ea5473f..c773fb3 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -16,6 +16,7 @@ HEADERS += $$files($$PWD/include/*.h) LIBS += -L$$PWD/lib + #DEFINES += DISCORD contains(DEFINES, DISCORD) { |