Lukas W 1059c92d87 Merge branch 'stable-1.2' ...

# Conflicts:
#	.travis/linux..before_install.sh
#	.travis/linux..install.sh
#	cmake/linux/lmms.desktop
#	plugins/vst_base/CMakeLists.txt

2017-10-18 17:33:55 +02:00

..

backgrounds

Sort lists generated from globbing expressions

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

locale

Updating translations for data/locale/nl.ts

2017-09-13 10:25:26 -04:00

presets

Xpressive plugin (#3259)

2017-06-26 19:45:59 +02:00

projects

Some fixes to recent files (#3621)

2017-06-10 20:38:17 +02:00

samples

Replacement metronome samples (#3513)

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

themes

Merge branch 'stable-1.2'

2017-10-18 17:33:55 +02: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