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
..
2017-02-23 04:21:47 +01:00
2017-02-23 04:21:47 +01:00
2017-05-15 12:21:34 +02:00
2017-10-16 15:01:13 +02:00
2017-05-15 12:21:34 +02:00
2017-05-15 12:21:34 +02:00
2017-02-23 04:21:47 +01:00
2018-07-06 12:42:15 +02:00
2018-06-28 20:23:53 +09:00
2018-07-06 12:42:15 +02:00
2018-06-28 20:23:53 +09:00
2018-07-06 12:42:15 +02:00
2018-06-28 20:23:53 +09:00
2017-02-23 04:21:47 +01:00
2017-02-23 04:21:47 +01:00