Merge remote-tracking branch 'origin/release' into stable

Change-Id: I905886417147ceb529ded43896939f65e66d7424
This commit is contained in:
Frederik Gladhorn
2013-04-03 16:06:45 +02:00
2 changed files with 50 additions and 0 deletions

View File

@@ -23,6 +23,8 @@ DEFINES += LOG_ENGINE
# If this macro is defined, the FFTReal DLL will not be built
#DEFINES += DISABLE_FFT
static: DEFINES += DISABLE_FFT
# Disables rendering of the waveform
#DEFINES += DISABLE_WAVEFORM