diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2018-11-16 00:07:19 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2018-11-16 00:07:19 +0100 |
| commit | 3a609d743841d5cebd883b66325cea66909986b6 (patch) | |
| tree | 017cf24acbf87063dac599c091b1e8479dc73266 /src/library/banshee | |
| parent | eb6b8095922ac53f91db583c7d996218bf93f667 (diff) | |
| parent | 0ee197c1dda4c0894dc10340d162a705888122f3 (diff) | |
Merge branch '2.1' of git@github.com:mixxxdj/mixxx.git into 2.2
# Conflicts:
# src/library/searchqueryparser.cpp
Diffstat (limited to 'src/library/banshee')
0 files changed, 0 insertions, 0 deletions