[SCM] calf/master: merge conflict

[js at users.alioth.debian.org]

save before testing own limiter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6a3c1a63a147948535a50da009275278ad5e6a3
X-Git-Newrev: 34569260c452f0fa4c543155ebba174a42a343dc

The following commit has been merged in the master branch:
commit ce4eecea1f73ba9d5c2fa433d3b479185d2a7d39
Merge: 2d3c66fb1197d361c11a8fe019c2828127af6d4c 4d8fd88ba6e84cb84aa687aad404579ac9c2b8e3
Author: Markus Schmidt <schmidt at boomshop.net>
Date:   Sun Nov 27 10:39:14 2011 +0100

    merge conflict

diff --combined src/audio_fx.cpp
index 819ba73,8e6e8c2..0626f80
--- a/src/audio_fx.cpp
+++ b/src/audio_fx.cpp
@@@ -636,7 -636,7 +636,7 @@@ void lookahead_limiter::process(float &
                  delta = this_delta;
              }
          }
-         if(debug) printf("\n");
 -        if(debug) printf("%.5f\n", delta);
++        if(debug) printf("%.5f\n\n", delta);
          // store actual peak and reset peak to 0.f
          chunks[chunk_num++ & (num_chunks - 1)] = peak;
          peak = 0.0f;

-- 
calf audio plugins packaging