diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2018-12-15 08:58:01 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2018-12-16 00:05:37 +0100 |
| commit | ea9c98367734788eb34cebc9b64d917b4b2ebcab (patch) | |
| tree | 119a0f6e7f1aa0b98ee0e581fa3ff81cec6c4502 /.travis.yml | |
| parent | 9f3b86ef353ee6741acf927a38f64b4d525a1e37 (diff) | |
| parent | 0d406345b56bafb8d046e372407849c57effdfbe (diff) | |
Merge remote-tracking branch 'upstream/2.2'
Conflicts:
build/debian/control
build/depends.py
res/skins/Tango/loop_jump_controls_left.xml
res/skins/Tango/loop_jump_controls_right.xml
src/engine/enginebuffer.cpp
src/preferences/broadcastprofile.cpp
src/preferences/dialog/dlgpreflibrary.cpp
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 9fe86976d7..d161c8d205 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,6 +44,7 @@ addons: - protobuf-compiler - qt5-default - qtscript5-dev + - libqt5x11extras5-dev - scons - vamp-plugin-sdk - qtkeychain-dev |