Merge branch 'stable-1.2'
# Conflicts: # .travis.yml # .travis/linux..script.sh # .travis/linux.win.download.sh # .travis/linux.win32.script.sh # .travis/linux.win64.script.sh # .travis/osx..script.sh # include/VstSyncController.h # plugins/audio_file_processor/audio_file_processor.cpp # plugins/zynaddsubfx/zynaddsubfx # plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp # plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h # src/gui/SetupDialog.cpp # src/gui/editors/SongEditor.cpp
This commit is contained in:
2
debian/changelog
vendored
2
debian/changelog
vendored
@@ -1,4 +1,4 @@
|
||||
lmms (1.2.0~rc7.1) unstable; urgency=low
|
||||
lmms (@VERSION@) unstable; urgency=low
|
||||
|
||||
* Upstream integration.
|
||||
* Drop Debian menu entry (policy 9.6).
|
||||
|
||||
Reference in New Issue
Block a user