Hyunjin Song 044c88c271 Merge branch 'stable-1.2' ...

# Conflicts:
#	.gitmodules
#	.travis.yml
#	.travis/linux..before_install.sh
#	.travis/linux..install.sh
#	CMakeLists.txt
#	cmake/linux/package_linux.sh.in
#	cmake/modules/BuildPlugin.cmake
#	include/AutomatableModel.h
#	plugins/MidiImport/MidiImport.cpp
#	plugins/carlapatchbay/CMakeLists.txt
#	plugins/carlarack/CMakeLists.txt
#	src/core/Song.cpp
#	src/core/Track.cpp
#	src/gui/editors/SongEditor.cpp
#	tests/src/core/AutomatableModelTest.cpp

2020-04-04 12:08:55 +09:00

..

apple

Merge branch 'stable-1.2'

2019-06-12 17:41:12 +09:00

install

CMake: extract dll installation code into a portable function

2019-09-04 10:15:31 +03:00

linux

Merge branch 'stable-1.2'

2020-04-04 12:08:55 +09:00

modules

Fix SDL2 detection

2020-03-11 11:55:33 -04:00

msys

Don't use temporary gz file for ppa listing

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

nsis

NSIS: Add compiler to installer name

2019-10-17 03:04:18 +03:00

scripts

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

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

toolchains

Fix finding pkg-config on cross compile

2018-11-22 14:01:23 +09: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