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

..

default

Merge remote-tracking branch 'origin/stable-1.0'

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

CMakeLists.txt

migrated build-system to CMAKE

2008-07-22 11:36:50 +00:00