Vesa a203ee4650 Merge branch 'stable-1.1' ...

Conflicts:
	plugins/delay/delaycontrols.cpp
	plugins/delay/delaycontrolsdialog.cpp
	plugins/delay/delayeffect.cpp

2014-12-23 13:21:03 +02:00

..

core

Merge branch 'stable-1.1'

2014-12-22 14:36:54 +02:00

gui

Merge branch 'stable-1.1'

2014-12-23 13:21:03 +02:00

tracks

Merge pull request #1481 from curlymorphic/i1080

2014-12-21 23:16:20 -05:00