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
..
2018-04-20 15:46:13 -04:00
2018-04-22 14:05:20 +02:00
2018-07-06 12:42:15 +02:00
2017-09-07 16:54:41 +09:00
2017-06-12 18:11:56 -04:00
2015-08-17 12:39:41 -04:00
2017-03-26 22:06:43 +02:00
2018-05-22 11:45:41 +02:00
2018-05-22 11:45:41 +02:00
2018-04-28 11:15:09 +02:00
2016-09-10 02:27:59 +00:00