diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2019-01-12 23:14:20 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2019-01-12 23:14:20 +0100 |
| commit | 5c0261a9c3cf23cc164f259a131f59f25b87cb03 (patch) | |
| tree | 01f8f05f48c56bbf7a6570f17ab9ca60849ed34b /src/mixer/playermanager.cpp | |
| parent | dd5de6b1ab592910e1f06f1b66fe170da94cf271 (diff) | |
| parent | 1f6d795252d0454962d1ae4dd284d100e6f4180f (diff) | |
Merge remote-tracking branch 'upstream/2.2'
Conflicts:
CHANGELOG.md
LICENSE
build/wix/LICENSE.rtf
src/defs_version.h
src/engine/controls/ratecontrol.cpp
Diffstat (limited to 'src/mixer/playermanager.cpp')
0 files changed, 0 insertions, 0 deletions