Hyunin Song 59cfcf41a7 Merge branch 'stable-1.2' ...

# Conflicts:
#	.travis/linux..before_install.sh
#	.travis/linux..install.sh
#	.travis/linux..script.sh
#	cmake/linux/package_linux.sh.in
#	include/AudioWeakJack.def
#	plugins/vst_base/CMakeLists.txt
#	plugins/zynaddsubfx/zynaddsubfx

2017-12-20 14:16:16 +09:00

..

core

Make factory samples relative (#3510)

2017-05-06 10:27:18 +02:00

tracks

Merge branch 'stable-1.2'

2017-12-20 14:16:16 +09:00