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

..

AUTHORS

Add myself (Michael Gregorius) to the list of authors

2017-06-05 23:50:39 +02:00

CMakeLists.txt

Add CMake doc target

2014-02-11 21:58:23 +01:00

Doxyfile.in

Add CMake doc target

2014-02-11 21:58:23 +01:00

lmms.1

Add FLAC export and related options (#3731)

2017-08-04 07:19:39 +09:00