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

..

classic

Merge branch 'stable-1.2'

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

default

Merge branch 'stable-1.2'

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

CMakeLists.txt

migrated build-system to CMAKE

2008-07-22 11:36:50 +00:00