[SCM] calf/master: Merged with master

[js at users.alioth.debian.org]

+ EQ-n: shorter names for calfjackhost and others
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 609de4fc2cf68efc12b69f6f37cd020478752e45
Merge: 693c4511f79976c9da1342251e1b527ff3443ded d8bb94eb5b9e0480f7d3b3c3b44563987d92a5bf
Author: Markus Schmidt <schmidt at boomshop.net>
Date:   Wed Nov 18 02:41:07 2009 +0100

    Merged with master

diff --combined src/calf/modulelist.h
index 0fbf487,b57dc08..fd1531f
--- a/src/calf/modulelist.h
+++ b/src/calf/modulelist.h
@@@ -13,10 -13,9 +13,10 @@@
      PER_MODULE_ITEM(sidechaincompressor, false, "sidechaincompressor")
      PER_MODULE_ITEM(multibandcompressor, false, "multibandcompressor")
      PER_MODULE_ITEM(deesser, false, "deesser")
-     PER_MODULE_ITEM(equalizer5band, false, "equalizer5band")
-     PER_MODULE_ITEM(equalizer8band, false, "equalizer8band")
-     PER_MODULE_ITEM(equalizer12band, false, "equalizer12band")
 +    PER_MODULE_ITEM(pulsator, false, "pulsator")
+     PER_MODULE_ITEM(equalizer5band, false, "eq5")
+     PER_MODULE_ITEM(equalizer8band, false, "eq8")
+     PER_MODULE_ITEM(equalizer12band, false, "eq12")
  #ifdef ENABLE_EXPERIMENTAL
      PER_MODULE_ITEM(fluidsynth, true, "fluidsynth")
      PER_MODULE_ITEM(wavetable, true, "wavetable")

-- 
calf audio plugins packaging