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

..

artwork.png

title label in artwork.png removed / alignment improved (#2995)

2016-08-26 13:01:35 +02:00

CMakeLists.txt

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

logo.png

Update effect plugin icons (#2938)

2016-07-29 00:40:02 +02:00

peak_controller_effect_control_dialog.cpp

update all copyright headers to the proper url (#3326)

2017-02-06 02:41:15 +02:00

peak_controller_effect_control_dialog.h

update all copyright headers to the proper url (#3326)

2017-02-06 02:41:15 +02:00

peak_controller_effect_controls.cpp

Merge branch 'stable-1.2'

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

peak_controller_effect_controls.h

update all copyright headers to the proper url (#3326)

2017-02-06 02:41:15 +02:00

peak_controller_effect.cpp

Merge branch 'stable-1.2'

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

peak_controller_effect.h

update all copyright headers to the proper url (#3326)

2017-02-06 02:41:15 +02:00