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

3.4 KiB

Raw Blame History

View Raw