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

..

apple

Disable fluidsynth audio backends if possible (#4300)

2018-04-20 15:46:13 -04:00

linux

AppImage: Use wget -N instead of mtime logic

2018-04-22 14:05:20 +02:00

modules

Merge branch 'stable-1.2'

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

msys

Don't use temporary gz file for ppa listing

2017-09-07 16:54:41 +09:00

nsis

Disable HiDPI fix for Windows 7 and older

2017-06-12 18:11:56 -04:00

postinstall

Initial Homebrew on OSX Lion patch

2015-08-17 12:39:41 -04:00

scripts

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

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

toolchains

Update CircleCI to Ubuntu 18.04

2018-04-28 11:15:09 +02:00

build_win32.sh

Update CircleCI to Ubuntu 18.04

2018-04-28 11:15:09 +02:00

build_win64.sh

Update CircleCI to Ubuntu 18.04

2018-04-28 11:15:09 +02:00

CMakeLists.txt

Implement version major.minor.release-stage.build (#3011)

2016-09-10 02:27:59 +00:00