Merge branch 'stable-1.1'

Browse Source

Conflicts:
	include/basic_filters.h
	src/core/FxMixer.cpp

...

This commit is contained in:

Vesa

2014-06-28 17:24:23 +03:00

parent 9a313e485a 0447e0fe44

commit a7bb31159e

22 changed files with 584 additions and 355 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

BIN

data/themes/default/mixer_send_off.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1022 B After Width:  |  Height:  |  Size: 817 B

BIN

data/themes/default/mixer_send_on.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.4 KiB

BIN

data/themes/default/receive_bg_arrow.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 289 B

BIN

data/themes/default/send_bg_arrow.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 270 B After Width:  |  Height:  |  Size: 316 B