Hyunjin Song 6782b6d6c4 Merge branch 'stable-1.2' ...

# Conflicts:
#	.mailmap
#	cmake/linux/lmms.desktop
#	src/gui/editors/PianoRoll.cpp
#	src/tracks/BBTrack.cpp

2019-09-15 21:08:33 +09:00

..

backgrounds

Sort lists generated from globbing expressions

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

locale

Fix broken translations in 12ea80d4fb

2019-07-22 09:01:58 +09:00

presets

Merge branch 'stable-1.2'

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

projects

Remove MIDI connections from factory .mmpz files (#5163)

2019-09-13 07:54:48 +09:00

samples

Replacement metronome samples (#3513)

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

themes

Merge branch 'stable-1.2'

2019-09-15 21:08:33 +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