diff options
author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-12-07 23:23:29 +0100 |
---|---|---|
committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-12-07 23:23:29 +0100 |
commit | 5ed122e334449fda0071c4572ce445ed9f2ede4e (patch) | |
tree | d68413698a282c1684c280cf670e09167109ed50 /src/broadcast | |
parent | 6bac62651147ff2a902347522a629aea13d81f17 (diff) | |
parent | e0f70a2cc1d10b65f5b7cf5bd832121510e66a11 (diff) |
Merge branch '2.3' of github.com:mixxxdj/mixxx into cleanup-headers
Diffstat (limited to 'src/broadcast')
-rw-r--r-- | src/broadcast/broadcastmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/broadcast/broadcastmanager.cpp b/src/broadcast/broadcastmanager.cpp index 0831d806cf..18a9801b8e 100644 --- a/src/broadcast/broadcastmanager.cpp +++ b/src/broadcast/broadcastmanager.cpp @@ -7,15 +7,15 @@ #undef WIN32 #endif +#include "broadcast/broadcastmanager.h" #include "broadcast/defs_broadcast.h" #include "engine/enginemaster.h" #include "engine/sidechain/enginenetworkstream.h" #include "engine/sidechain/enginesidechain.h" +#include "moc_broadcastmanager.cpp" #include "soundio/soundmanager.h" #include "util/logger.h" -#include "broadcast/broadcastmanager.h" - namespace { const mixxx::Logger kLogger("BroadcastManager"); } |