Merge branch 'stable-1.2'

Browse Source

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

...

This commit is contained in:

Lukas W

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

parent 7f92b82738 20ea945cee

commit 1059c92d87

37 changed files with 2514 additions and 57 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1912

data/application-x-lmms-project.svg

File diff suppressed because it is too large Load Diff

Side by Side Before Width:  |  Height:  |  Size: 66 KiB

BIN

data/themes/default/lcd_19green.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 643 B After Width:  |  Height:  |  Size: 808 B

BIN

data/themes/default/lcd_19red.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 637 B After Width:  |  Height:  |  Size: 799 B

BIN

data/themes/default/lcd_21pink.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 641 B After Width:  |  Height:  |  Size: 803 B