Lukas W 12edb58c77 Merge remote-tracking branch 'upstream/stable-1.2' ...

# Conflicts:
#	data/themes/default/style.css
#	src/gui/ExportProjectDialog.cpp
#	src/tracks/Pattern.cpp

2017-08-27 13:07:45 +02:00

..

backgrounds

Sort lists generated from globbing expressions

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

locale

Merge branch 'stable-1.2' into master (@liushuyu)

2017-07-15 08:08:07 +09: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 remote-tracking branch 'upstream/stable-1.2'

2017-08-27 13:07:45 +02:00

wavetables

Sort lists generated from globbing expressions

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

application-x-lmms-project.svg

Adding MIME-type icon to the data directory for packagers to use

2014-02-05 05:35:56 +02:00

CMakeLists.txt

Cleanup root directory

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