diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2019-01-12 22:54:11 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2019-01-12 22:54:11 +0100 |
| commit | 1f6d795252d0454962d1ae4dd284d100e6f4180f (patch) | |
| tree | 9c2395215117697e8ed253c6121404e2b31e04c5 /src/library/browse/foldertreemodel.cpp | |
| parent | fc7030bbcff97d69a8a6d1aa4c1ac90911100f62 (diff) | |
| parent | 9c5cf8ac211ad5df4267db00aa3f111e23c5dfc1 (diff) | |
Merge remote-tracking branch 'upstream/2.1' into 2.2
Diffstat (limited to 'src/library/browse/foldertreemodel.cpp')
0 files changed, 0 insertions, 0 deletions