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

..

backgrounds

Sort lists generated from globbing expressions

2016-06-07 20:15:55 +02:00

locale

Merge branch 'stable-1.2'

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

presets

Merge branch 'stable-1.2'

2018-03-07 23:54:28 +09:00

projects

Some demo project license fixes (#4481)

2018-07-15 14:03:37 +02:00

samples

Replacement metronome samples (#3513)

2017-05-17 10:10:40 -04:00

themes

Merge branch 'stable-1.2'

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

wavetables

Sort lists generated from globbing expressions

2016-06-07 20:15:55 +02:00

CMakeLists.txt

Cleanup root directory

2015-08-13 11:37:47 -04:00