Hyunjin Song 4069aaada2 Merge branch 'stable-1.2' ...

# Conflicts:
#	.travis/osx..install.sh
#	CMakeLists.txt
#	cmake/apple/install_apple.sh.in
#	doc/lmms.1
#	include/VstSyncController.h
#	plugins/carlabase/carla.h
#	plugins/vestige/vestige.cpp
#	plugins/vst_base/CMakeLists.txt
#	plugins/vst_base/RemoteVstPlugin.cpp
#	plugins/vst_base/Win64/CMakeLists.txt
#	plugins/zynaddsubfx/zynaddsubfx
#	plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
#	src/core/Song.cpp
#	src/core/main.cpp

2018-09-18 09:54:38 +09:00

..

artwork-patchbay.png

Add background artwork for carla

2014-10-10 11:21:23 +01:00

artwork-rack.png

Add background artwork for carla

2014-10-10 11:21:23 +01:00

carla.cpp

Merge branch 'stable-1.2'

2018-09-18 09:54:38 +09:00

carla.h

Merge branch 'stable-1.2'

2018-09-18 09:54:38 +09:00

CMakeLists.txt

Merge branch 'stable-1.2'

2018-09-18 09:54:38 +09:00