Merge branch 'stable-1.2'
# Conflicts: # .gitmodules # .travis.yml # .travis/linux..before_install.sh # .travis/linux..install.sh # CMakeLists.txt # cmake/linux/package_linux.sh.in # cmake/modules/BuildPlugin.cmake # include/AutomatableModel.h # plugins/MidiImport/MidiImport.cpp # plugins/carlapatchbay/CMakeLists.txt # plugins/carlarack/CMakeLists.txt # src/core/Song.cpp # src/core/Track.cpp # src/gui/editors/SongEditor.cpp # tests/src/core/AutomatableModelTest.cpp
This commit is contained in:
1
debian/control
vendored
1
debian/control
vendored
@@ -28,6 +28,7 @@ Build-Depends:
|
||||
libsoundio-dev,
|
||||
libstk0-dev,
|
||||
libvorbis-dev,
|
||||
libx11-xcb-dev,
|
||||
libxcb-keysyms1-dev,
|
||||
libxcb-util0-dev,
|
||||
libxml-perl,
|
||||
|
||||
Reference in New Issue
Block a user