Hyunin Song
8a41def616
Merge branch 'stable-1.2'
# Conflicts:
# .circleci/config.yml
# .travis/osx..install.sh
# CMakeLists.txt
# plugins/zynaddsubfx/zynaddsubfx
# plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h
# plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
# plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp
# plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp
# src/CMakeLists.txt
# src/core/Track.cpp
# src/tracks/Pattern.cpp
2018-05-01 09:59:07 +09:00
..
2017-12-23 02:23:32 -05:00
2018-05-01 09:59:07 +09:00
2017-11-19 14:25:39 +09:00
2018-04-03 19:08:53 +01:00
2017-02-06 02:41:15 +02:00
2018-01-26 10:48:46 -05:00
2017-11-29 15:33:36 +01:00