Tobias Doerffel 1f661be72c Merge remote-tracking branch 'origin/stable-1.0' ...

Conflicts:
	plugins/CMakeLists.txt
	plugins/zynaddsubfx/src/Effects/Alienwah.cpp
	src/core/track.cpp

2014-04-12 11:08:27 +02:00

..

add1_active.png

…

add1_inactive.png

…

artwork.png

…

avg_active.png

…

avg_inactive.png

…

CMakeLists.txt

…

dynamics_processor_control_dialog.cpp

…

dynamics_processor_control_dialog.h

…

dynamics_processor_controls.cpp

…

dynamics_processor_controls.h

…

dynamics_processor.cpp

…

dynamics_processor.h

…

logo.png

…

max_active.png

…

max_inactive.png

…

reset_active.png

…

reset_inactive.png

…

smooth_active.png

…

smooth_inactive.png

…

sub1_active.png

…

sub1_inactive.png

…

unl_active.png

…

unl_inactive.png

…

wavegraph.png

…