Lukas W 3c6f200beb Merge branch 'stable-1.2' ...

# Conflicts:
#	cmake/modules/BuildPlugin.cmake
#	plugins/CMakeLists.txt
#	plugins/LadspaEffect/swh/CMakeLists.txt
#	plugins/LadspaEffect/tap/CMakeLists.txt
#	plugins/zynaddsubfx/zynaddsubfx
#	plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
#	src/gui/MainWindow.cpp

2018-07-06 12:42:15 +02:00

..

backgrounds

Sort lists generated from globbing expressions

2016-06-07 20:15:55 +02:00

locale

Merge branch 'stable-1.2'

2018-07-06 12:42:15 +02:00

presets

Merge branch 'stable-1.2'

2018-03-07 23:54:28 +09:00

projects

Remove MIDI connection from factory files (#4207)

2018-03-06 09:57:40 +09:00

samples

Replacement metronome samples (#3513)

2017-05-17 10:10:40 -04:00

themes

Merge branch 'stable-1.2'

2018-05-01 09:59:07 +09:00

wavetables

Sort lists generated from globbing expressions

2016-06-07 20:15:55 +02:00

CMakeLists.txt

Cleanup root directory

2015-08-13 11:37:47 -04:00