Vesa 150b16bd15 Merge branch 'stable-1.1' ...

Conflicts:
	include/lmms_math.h
	plugins/delay/delaycontrolsdialog.cpp
	src/core/FxMixer.cpp
	src/gui/FxMixerView.cpp

2014-12-10 01:38:17 +02:00

..

core

Merge branch 'stable-1.1'

2014-12-10 01:38:17 +02:00

gui

Fix master channel peak display

2014-12-10 01:33:49 +02:00

tracks

Remove whitespace from setHintText, change spaces to tabs

2014-12-08 23:48:44 +00:00