Hyunjin Song 12ea80d4fb Merge branch 'stable-1.2' ...

# Conflicts:
#	data/locale/cs.ts
#	data/locale/en.ts
#	data/locale/ko.ts
#	data/locale/ru.ts
#	data/locale/uk.ts
#	data/locale/zh_TW.ts
#	include/Engine.h
#	plugins/nes/Nes.cpp
#	src/core/NotePlayHandle.cpp
#	src/core/SampleBuffer.cpp
#	src/tracks/SampleTrack.cpp

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

..

apple

Merge branch 'stable-1.2'

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

linux

Fix the wrong merge

2019-05-06 16:43:01 +09:00

modules

Modify VST build systems to make debian integration work correctly

2019-03-11 16:20:42 +09:00

msys

Don't use temporary gz file for ppa listing

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

nsis

Merge branch 'stable-1.2'

2018-10-29 16:20:58 +09: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

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