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
This commit is contained in:
Hyunjin Song
2019-06-12 17:41:12 +09:00
35 changed files with 14916 additions and 45037 deletions

View File

@@ -3,3 +3,6 @@
set -e
brew update
# appdmg doesn't work with old versions of Node.js
nvm install --lts

View File

@@ -19,4 +19,4 @@ brew install $PACKAGES
# fftw tries to install gcc which conflicts with travis
brew install fftw --ignore-dependencies
sudo npm install -g appdmg
npm install -g appdmg