diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2018-11-05 22:45:55 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2018-11-05 22:45:55 +0100 |
| commit | 54261f3b8f3221578aa95c928ca5217852eeac9b (patch) | |
| tree | c1c88dca105dae05d09f0d6a2ccc21ed6525bb99 | |
| parent | 4fbb87560e64aa77242f2d4fd79ed68ed6f95a99 (diff) | |
| parent | 6420867cc8a73d3845bf25d5b98babb142386da4 (diff) | |
Merge remote-tracking branch 'upstream/2.2'
Conflicts:
SConscript
src/defs_version.h
src/sources/soundsourceproxy.cpp
