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

Conflicts:
	plugins/CMakeLists.txt
	plugins/zynaddsubfx/src/Effects/Alienwah.cpp
	src/core/track.cpp
This commit is contained in:
Tobias Doerffel committed 2014-04-12 11:08:27 +02:00
commit 1f661be72c
13 files changed
+1843 -1500

No files matched your search

@@ -30,7 +30,7 @@
#include "embed.cpp"
#ifdef LMMS_BUILD_WIN32
#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE)
#ifndef isnanf
#define isnanf(x) isnan(x)
#endif