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

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

2014-11-26 14:10:00 +02:00

..

artwork.png

…

CMakeLists.txt

…

delaycontrols.cpp

…

delaycontrols.h

…

delaycontrolsdialog.cpp

…

delaycontrolsdialog.h

…

delayeffect.cpp

…

delayeffect.h

…

lfo.cpp

…

lfo.h

…

logo.png

…

stereodelay.cpp

…

stereodelay.h

…