diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-02-15 21:32:29 +0100 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-02-15 21:32:29 +0100 |
| commit | 0c5c24e036d46019ef0851748fcf968bbc4474e0 (patch) | |
| tree | da6ed62db9330ead0e8bf0a8d01be3b54fd32d5e | |
| parent | 13914af17942b081ab915a39c4b014e66a62db37 (diff) | |
| parent | 26fc46fef090d964cf1ab37065f759b75fccf393 (diff) | |
Merge branch 'master' of github.com:mixxxdj/mixxx into serato-library-feature
