diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2016-01-10 20:01:27 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2016-01-10 20:01:27 +0100 |
| commit | 26309cda4530f62f4561e55cb7b489ffdf64a2ba (patch) | |
| tree | 40f774a5cd6705482efb662132ccafff70d8545d /src/vinylcontrol/vinylcontrolxwax.cpp | |
| parent | a5213da5b2b7eef213625d8778971e070675e926 (diff) | |
| parent | b2e8f90b07634e7f6a6836eebdc99121f41a9726 (diff) | |
Merge remote-tracking branch 'upstream/master' into ContrlObjectSlaveDirect
Conflicts:
src/dlgprefshoutcast.cpp
src/dlgprefshoutcast.h
Diffstat (limited to 'src/vinylcontrol/vinylcontrolxwax.cpp')
| -rw-r--r-- | src/vinylcontrol/vinylcontrolxwax.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/vinylcontrol/vinylcontrolxwax.cpp b/src/vinylcontrol/vinylcontrolxwax.cpp index e810a9d5e5..11e132d222 100644 --- a/src/vinylcontrol/vinylcontrolxwax.cpp +++ b/src/vinylcontrol/vinylcontrolxwax.cpp @@ -27,7 +27,6 @@ #include "controlobjectthread.h" #include "controlobjectslave.h" #include "controlobject.h" -#include "sampleutil.h" #include "util/math.h" #include "util/defs.h" |