Merge remote-tracking branch 'origin/stable-0.4-new-fx-mixer'

Browse Source

Conflicts:
	include/PlayHandle.h
	src/core/FxMixer.cpp
	src/core/Mixer.cpp
	src/gui/FxMixerView.cpp
	src/tracks/InstrumentTrack.cpp

...

This commit is contained in:

Tobias Doerffel

2014-03-26 11:21:15 +01:00

parent 8e4d66d707 12939c24df

commit 89dc820d7b

21 changed files with 1678 additions and 608 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 Normal file

Binary file not shown.

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

BIN

data/themes/default/mixer_send_on.png Normal file

Binary file not shown.

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

BIN

data/themes/default/send_bg_arrow.png Normal file

Binary file not shown.

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