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

..

apple

Merge branch 'stable-1.2'

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

linux

Fix typo in previous merge

2018-08-25 08:51:29 +09:00

modules

Merge branch 'stable-1.2'

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

msys

Don't use temporary gz file for ppa listing

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

nsis

MSVC fixes (#4352)

2018-07-07 17:16:08 +02: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

Merge remote-tracking branch 'lukas/cleanup/qt4'

2018-07-17 08:52:49 +02:00

build_win32.sh

Fix compilation with MinGW versions without threads support

2018-07-07 17:16:08 +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

uninstall.cmake

CMake: Minor uninstall changes

2018-07-22 11:41:54 +02:00